"The Great Renaming" continues.

More changes to match the renamed files of LLVM 3.3.

dmd2/module.c

@@ -47,9 +47,15 @@
 #endif
 
 #if IN_LLVM
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Type.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/DerivedTypes.h"
+#else
 #include "llvm/Type.h"
 #include "llvm/LLVMContext.h"
 #include "llvm/DerivedTypes.h"
+#endif
 #include "llvm/Support/CommandLine.h"
 #include <map>
 

driver/cl_options.cpp

@@ -11,7 +11,9 @@
 #include "gen/cl_helpers.h"
 
 #include "llvm/Target/TargetMachine.h"
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/DataLayout.h"
+#elif LDC_LLVM_VER == 302
 #include "llvm/DataLayout.h"
 #else
 #include "llvm/Target/TargetData.h"

driver/main.cpp

@@ -11,7 +11,11 @@
 #include "gen/llvm.h"
 #include "llvm/LinkAllVMCore.h"
 #include "llvm/Linker.h"
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/LLVMContext.h"
+#else
 #include "llvm/LLVMContext.h"
+#endif
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Support/TargetSelect.h"

gen/asmstmt.cpp

@@ -8,7 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "gen/llvm.h"
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/InlineAsm.h"
+#else
 #include "llvm/InlineAsm.h"
+#endif
 
 //#include "d-gcc-includes.h"
 //#include "total.h"

gen/functions.cpp

@@ -9,7 +9,11 @@
 
 #include "gen/llvm.h"
 #include "llvm/Support/CFG.h"
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Intrinsics.h"
+#else
 #include "llvm/Intrinsics.h"
+#endif
 
 #include "mtype.h"
 #include "aggregate.h"

gen/llvm.h

@@ -29,6 +29,9 @@
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Value.h"
 #include "llvm/IR/Attributes.h"
+#include "llvm/IR/DataLayout.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/DebugInfo.h"
 #else
 #include "llvm/Type.h"
 #include "llvm/DerivedTypes.h"
@@ -40,17 +43,17 @@
 #include "llvm/Module.h"
 #include "llvm/Value.h"
 #include "llvm/Attributes.h"
-#endif
-
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER == 302
 #include "llvm/DataLayout.h"
-#include "llvm/DebugInfo.h"
 #include "llvm/IRBuilder.h"
+#include "llvm/DebugInfo.h"
 #else
 #include "llvm/Target/TargetData.h"
 #include "llvm/Analysis/DebugInfo.h"
 #include "llvm/Support/IRBuilder.h"
 #endif
+#endif
+
 
 #include "gen/llvmcompat.h"
 

gen/llvmcompat.cpp

@@ -10,14 +10,21 @@
 #include "gen/llvmcompat.h"
 #include "llvm/Config/llvm-config.h"
 #include "llvm/ADT/Triple.h"
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/IRBuilder.h"
+#else
 #include "llvm/DerivedTypes.h"
 #include "llvm/Function.h"
 #include "llvm/Module.h"
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER == 302
 #include "llvm/IRBuilder.h"
 #else
 #include "llvm/Support/IRBuilder.h"
 #endif
+#endif
 #include <string>
 
 #if LDC_LLVM_VER == 300

gen/logger.cpp

@@ -19,7 +19,11 @@
 
 #include "llvm/Support/CommandLine.h"
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/GlobalValue.h"
+#else
 #include "llvm/GlobalValue.h"
+#endif
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/raw_os_ostream.h"
 #include "llvm/Assembly/Writer.h"

gen/metadata.h

@@ -17,7 +17,11 @@
 #define LDC_GEN_METADATA_H
 
 // MDNode was moved into its own header, and contains Value*s
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Metadata.h"
+#else
 #include "llvm/Metadata.h"
+#endif
 typedef llvm::Value MDNodeField;
 
 #define METADATA_LINKAGE_TYPE  llvm::GlobalValue::WeakODRLinkage

gen/module.cpp

@@ -9,13 +9,18 @@
 
 #include "gen/llvm.h"
 #include "llvm/Analysis/Verifier.h"
-#include "llvm/Module.h"
 #include "llvm/LinkAllPasses.h"
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Module.h"
+#include "llvm/IR/DataLayout.h"
+#else
+#include "llvm/Module.h"
+#if LDC_LLVM_VER == 302
 #include "llvm/DataLayout.h"
 #else
 #include "llvm/Target/TargetData.h"
 #endif
+#endif
 
 #include "mars.h"
 #include "module.h"

gen/naked.cpp

@@ -8,7 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "gen/llvm.h"
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/InlineAsm.h"
+#else
 #include "llvm/InlineAsm.h"
+#endif
 
 #include "expression.h"
 #include "statement.h"

gen/optimizer.cpp

@@ -17,16 +17,17 @@
 #include "llvm/LinkAllPasses.h"
 #if LDC_LLVM_VER >= 303
 #include "llvm/IR/Module.h"
+#include "llvm/IR/DataLayout.h"
 #else
 #include "llvm/Module.h"
-#endif
-#include "llvm/ADT/Triple.h"
-#include "llvm/Analysis/Verifier.h"
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER == 302
 #include "llvm/DataLayout.h"
 #else
 #include "llvm/Target/TargetData.h"
 #endif
+#endif
+#include "llvm/ADT/Triple.h"
+#include "llvm/Analysis/Verifier.h"
 #include "llvm/Target/TargetLibraryInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/CommandLine.h"

gen/passes/GarbageCollect2Stack.cpp

@@ -27,14 +27,17 @@
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/DataLayout.h"
 #else
 #include "llvm/Module.h"
 #include "llvm/Constants.h"
 #include "llvm/Intrinsics.h"
 #if LDC_LLVM_VER == 302
 #include "llvm/IRBuilder.h"
+#include "llvm/DataLayout.h"
 #else
 #include "llvm/Support/IRBuilder.h"
+#include "llvm/Target/TargetData.h"
 #endif
 #endif
 #include "llvm/Support/CallSite.h"
@@ -42,11 +45,6 @@
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Analysis/ValueTracking.h"
-#if LDC_LLVM_VER >= 302
-#include "llvm/DataLayout.h"
-#else
-#include "llvm/Target/TargetData.h"
-#endif
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"

gen/passes/SimplifyDRuntimeCalls.cpp

@@ -23,22 +23,20 @@
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/DataLayout.h"
 #else
 #include "llvm/Function.h"
 #include "llvm/Intrinsics.h"
 #if LDC_LLVM_VER == 302
 #include "llvm/IRBuilder.h"
+#include "llvm/DataLayout.h"
 #else
 #include "llvm/Support/IRBuilder.h"
+#include "llvm/Target/TargetData.h"
 #endif
 #endif
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/ValueTracking.h"
-#if LDC_LLVM_VER >= 302
-#include "llvm/DataLayout.h"
-#else
-#include "llvm/Target/TargetData.h"
-#endif
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Compiler.h"

gen/passes/StripExternals.cpp

@@ -19,7 +19,11 @@
 
 #include "Passes.h"
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Module.h"
+#else
 #include "llvm/Module.h"
+#endif
 #include "llvm/Pass.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Compiler.h"

gen/rttibuilder.h

@@ -15,7 +15,11 @@
 #ifndef __LDC_GEN_RTTIBUILDER_H__
 #define __LDC_GEN_RTTIBUILDER_H__
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Constant.h"
+#else
 #include "llvm/Constant.h"
+#endif
 #include "llvm/ADT/SmallVector.h"
 
 struct ClassDeclaration;

gen/runtime.cpp

@@ -8,8 +8,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "gen/llvm.h"
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Module.h"
+#include "llvm/IR/Attributes.h"
+#else
 #include "llvm/Module.h"
 #include "llvm/Attributes.h"
+#endif
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/CommandLine.h"

gen/statements.cpp

@@ -13,7 +13,11 @@
 #include <fstream>
 
 #include "gen/llvm.h"
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/InlineAsm.h"
+#else
 #include "llvm/InlineAsm.h"
+#endif
 #include "llvm/Support/CFG.h"
 
 #include "mars.h"

ir/ir.cpp

@@ -7,7 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/DataLayout.h"
+#elif LDC_LLVM_VER == 302
 #include "llvm/DataLayout.h"
 #else
 #include "llvm/Target/TargetData.h"

ir/irclass.cpp

@@ -7,8 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/DerivedTypes.h"
+#else
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
+#endif
 #include "llvm/ADT/SmallString.h"
 
 #include "aggregate.h"

ir/irtype.cpp

@@ -7,8 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/DerivedTypes.h"
+#include "llvm/IR/LLVMContext.h"
+#else
 #include "llvm/DerivedTypes.h"
 #include "llvm/LLVMContext.h"
+#endif
 #include "mars.h"
 #include "mtype.h"
 #include "gen/irstate.h"

ir/irtype.h

@@ -16,7 +16,11 @@
 #ifndef __LDC_IR_IRTYPE_H__
 #define __LDC_IR_IRTYPE_H__
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Type.h"
+#else
 #include "llvm/Type.h"
+#endif
 
 //////////////////////////////////////////////////////////////////////////////
 

ir/irtypeclass.cpp

@@ -7,7 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/DerivedTypes.h"
+#else
 #include "llvm/DerivedTypes.h"
+#endif
 
 #include "aggregate.h"
 #include "declaration.h"

ir/irtypeclass.h

@@ -15,7 +15,11 @@
 #define __LDC_IR_IRTYPECLASS_H__
 
 #include "ir/irtypestruct.h"
+#if LDC_LLVM_VER >= 303
+#include <llvm/IR/DerivedTypes.h>
+#else
 #include <llvm/DerivedTypes.h>
+#endif
 
 ///
 class IrTypeClass : public IrTypeAggr

ir/irtypefunction.cpp

@@ -7,7 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/DerivedTypes.h"
+#else
 #include "llvm/DerivedTypes.h"
+#endif
 #include "mtype.h"
 
 #include "gen/irstate.h"

ir/irtypestruct.cpp

@@ -7,7 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/DerivedTypes.h"
+#else
 #include "llvm/DerivedTypes.h"
+#endif
 
 #include "aggregate.h"
 #include "declaration.h"

ir/irvar.h

@@ -16,7 +16,11 @@
 #define LDC_IR_IRVAR_H
 
 #include "ir/ir.h"
+#if LDC_LLVM_VER >= 303
+#include "llvm/IR/Type.h"
+#else
 #include "llvm/Type.h"
+#endif
 
 struct IrFuncTyArg;