Fix includes for LLVM 3.5

dmd2/declaration.h

@@ -19,7 +19,9 @@
 #include <set>
 #include <map>
 #include <string>
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/DebugInfo.h"
+#elif LDC_LLVM_VER >= 302
 #include "llvm/DebugInfo.h"
 #else
 #include "llvm/Analysis/DebugInfo.h"

driver/linker.cpp

@@ -18,7 +18,11 @@
 #include "gen/optimizer.h"
 #include "gen/programs.h"
 #include "llvm/ADT/Triple.h"
+#if LDC_LLVM_VER >= 305
+#include "llvm/Linker/Linker.h"
+#else
 #include "llvm/Linker.h"
+#endif
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/Path.h"

driver/main.cpp

@@ -32,7 +32,11 @@
 #include "gen/optimizer.h"
 #include "gen/passes/Passes.h"
 #include "gen/runtime.h"
+#if LDC_LLVM_VER >= 305
+#include "llvm/Linker/Linker.h"
+#else
 #include "llvm/Linker.h"
+#endif
 #include "llvm/Support/Host.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/TargetRegistry.h"

gen/dibuilder.h

@@ -14,8 +14,13 @@
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/DataLayout.h"
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/DebugInfo.h"
+#include "llvm/IR/DIBuilder.h"
+#else
 #include "llvm/DebugInfo.h"
 #include "llvm/DIBuilder.h"
+#endif
 #else
 #if LDC_LLVM_VER == 302
 #include "llvm/DataLayout.h"

gen/functions.cpp

@@ -29,13 +29,21 @@
 #include "gen/pragma.h"
 #include "gen/runtime.h"
 #include "gen/tollvm.h"
+#if LDC_LLVM_VER >= 305
+#include "llvm/Linker/Linker.h"
+#else
 #include "llvm/Linker.h"
+#endif
 #if LDC_LLVM_VER >= 303
 #include "llvm/IR/Intrinsics.h"
 #else
 #include "llvm/Intrinsics.h"
 #endif
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/CFG.h"
+#else
 #include "llvm/Support/CFG.h"
+#endif
 #include <iostream>
 
 #if LDC_LLVM_VER == 302

gen/irstate.h

@@ -26,7 +26,11 @@
 #include <sstream>
 #include <vector>
 
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/CallSite.h"
+#else
 #include "llvm/Support/CallSite.h"
+#endif
 
 namespace llvm {
     class LLVMContext;

gen/llvm.h

@@ -31,7 +31,11 @@
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/IRBuilder.h"
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/DebugInfo.h"
+#else
 #include "llvm/DebugInfo.h"
+#endif
 #else
 #include "llvm/Type.h"
 #include "llvm/DerivedTypes.h"
@@ -57,7 +61,11 @@
 
 #include "gen/llvmcompat.h"
 
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/CallSite.h"
+#else
 #include "llvm/Support/CallSite.h"
+#endif
 
 using llvm::IRBuilder;
 

gen/optimizer.cpp

@@ -34,7 +34,11 @@
 #include "llvm/Target/TargetLibraryInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/CommandLine.h"
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/LegacyPassNameParser.h"
+#else
 #include "llvm/Support/PassNameParser.h"
+#endif
 #include "llvm/Transforms/Instrumentation.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/IPO/PassManagerBuilder.h"

gen/passes/GarbageCollect2Stack.cpp

@@ -38,7 +38,11 @@
 #include "llvm/Target/TargetData.h"
 #endif
 #endif
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/CallSite.h"
+#else
 #include "llvm/Support/CallSite.h"
+#endif
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Analysis/CallGraph.h"
 #if LDC_LLVM_VER >= 305

gen/statements.cpp

@@ -24,7 +24,11 @@
 #include "ir/irfunction.h"
 #include "ir/irlandingpad.h"
 #include "ir/irmodule.h"
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/CFG.h"
+#else
 #include "llvm/Support/CFG.h"
+#endif
 #if LDC_LLVM_VER >= 303
 #include "llvm/IR/InlineAsm.h"
 #else

ir/irtypeaggr.h

@@ -12,7 +12,9 @@
 
 #include "ir/irtype.h"
 #include "llvm/ADT/ArrayRef.h"
-#if LDC_LLVM_VER >= 302
+#if LDC_LLVM_VER >= 305
+#include "llvm/IR/DebugInfo.h"
+#elif LDC_LLVM_VER >= 302
 #include "llvm/DebugInfo.h"
 #else
 #include "llvm/Analysis/DebugInfo.h"