@@ -29,13 +29,20 @@

 #include "llvm/ADT/PostOrderIterator.h"

 #include "llvm/ADT/SCCIterator.h"

 #include "llvm/Analysis/CallGraph.h"

-#include "llvm/Analysis/Verifier.h"

 #if LLVM_VERSION < 32

 #include "llvm/Analysis/DebugInfo.h"

-#else

+#elif LLVM_VERSION < 35

 #include "llvm/DebugInfo.h"

+#else

+#include "llvm/IR/DebugInfo.h"

 #endif

+#if LLVM_VERSION < 35

 #include "llvm/Analysis/Dominators.h"

+#include "llvm/Analysis/Verifier.h"

+#else

+#include "llvm/IR/Dominators.h"

+#include "llvm/IR/Verifier.h"

+#endif

 #include "llvm/Analysis/ConstantFolding.h"

 #if LLVM_VERSION < 29

 //#include "llvm/Analysis/LiveValues.h" (unused)

@@ -50,9 +57,14 @@

 #include "llvm/Config/config.h"

 #include "llvm/Pass.h"

 #include "llvm/Support/CommandLine.h"

+#if LLVM_VERSION < 35

 #include "llvm/Support/DataFlow.h"

 #include "llvm/Support/InstIterator.h"

 #include "llvm/Support/GetElementPtrTypeIterator.h"

+#else

+#include "llvm/IR/InstIterator.h"

+#include "llvm/IR/GetElementPtrTypeIterator.h"

+#endif

 #include "llvm/ADT/DepthFirstIterator.h"

 #include "llvm/Transforms/Scalar.h"

 #include "llvm/Transforms/Utils/BasicBlockUtils.h"

@@ -71,7 +83,6 @@

 #include "llvm/Intrinsics.h"

 #include "llvm/LLVMContext.h"

 #include "llvm/Module.h"

-#include "llvm/Support/InstVisitor.h"

 #else

 #include "llvm/IR/DerivedTypes.h"

 #include "llvm/IR/Instructions.h"

@@ -79,7 +90,14 @@

 #include "llvm/IR/Intrinsics.h"

 #include "llvm/IR/LLVMContext.h"

 #include "llvm/IR/Module.h"

+#endif

+

+#if LLVM_VERSION < 33

+#include "llvm/Support/InstVisitor.h"

+#elif LLVM_VERSION < 35

 #include "llvm/InstVisitor.h"

+#else

+#include "llvm/IR/InstVisitor.h"

 #endif

 #define DEFINEPASS(passname) passname() : FunctionPass(ID)

@@ -103,10 +121,18 @@ namespace llvm {

   private:

       DenseSet<Function*> badFunctions;

       std::vector<Instruction*> delInst;

+#if LLVM_VERSION < 35

       CallGraphNode *rootNode;

+#else

+      CallGraph *CG;

+#endif

   public:

       static char ID;

+#if LLVM_VERSION < 35

       DEFINEPASS(PtrVerifier), rootNode(0), PT(), TD(), SE(), expander(),

+#else

+      DEFINEPASS(PtrVerifier), CG(0), PT(), TD(), SE(), expander(),

+#endif

           DT(), AbrtBB(), Changed(false), valid(false), EP() {

 #if LLVM_VERSION >= 29

           initializePtrVerifierPass(*PassRegistry::getPassRegistry());

@@ -133,12 +159,21 @@ namespace llvm {

           AbrtBB = 0;

           valid = true;

+#if LLVM_VERSION < 35

           if (!rootNode) {

               rootNode = getAnalysis<CallGraph>().getRoot();

+#else

+          if (!CG) {

+              CG = &getAnalysis<CallGraphWrapperPass>().getCallGraph();

+#endif

               // No recursive functions for now.

               // In the future we may insert runtime checks for stack depth.

+#if LLVM_VERSION < 35

               for (scc_iterator<CallGraphNode*> SCCI = scc_begin(rootNode),

                        E = scc_end(rootNode); SCCI != E; ++SCCI) {

+#else

+              for (scc_iterator<CallGraph*> SCCI = scc_begin(CG); !SCCI.isAtEnd(); ++SCCI) {

+#endif

                   const std::vector<CallGraphNode*> &nextSCC = *SCCI;

                   if (nextSCC.size() > 1 || SCCI.hasLoop()) {

                       errs() << "INVALID: Recursion detected, callgraph SCC components: ";

@@ -164,12 +199,19 @@ namespace llvm {

           EP = &*It;

 #if LLVM_VERSION < 32

           TD = &getAnalysis<TargetData>();

-#else

+#elif LLVM_VERSION < 35

           TD = &getAnalysis<DataLayout>();

+#else

+          DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>();

+          TD = DLP ? &DLP->getDataLayout() : 0;

 #endif

           SE = &getAnalysis<ScalarEvolution>();

           PT = &getAnalysis<PointerTracking>();

+#if LLVM_VERSION < 35

           DT = &getAnalysis<DominatorTree>();

+#else

+          DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();

+#endif

           expander = new SCEVExpander(*SE OPT("SCEVexpander"));

           std::vector<Instruction*> insns;

@@ -307,13 +349,23 @@ namespace llvm {

       virtual void getAnalysisUsage(AnalysisUsage &AU) const {

 #if LLVM_VERSION < 32

           AU.addRequired<TargetData>();

-#else

+#elif LLVM_VERSION < 35

           AU.addRequired<DataLayout>();

+#else

+          AU.addRequired<DataLayoutPass>();

 #endif

+#if LLVM_VERSION < 35

           AU.addRequired<DominatorTree>();

+#else

+          AU.addRequired<DominatorTreeWrapperPass>();

+#endif

           AU.addRequired<ScalarEvolution>();

           AU.addRequired<PointerTracking>();

+#if LLVM_VERSION < 35

           AU.addRequired<CallGraph>();

+#else

+          AU.addRequired<CallGraphWrapperPass>();

+#endif

       }

       bool isValid() const { return valid; }

@@ -321,8 +373,10 @@ namespace llvm {

       PointerTracking *PT;

 #if LLVM_VERSION < 32

       TargetData *TD;

-#else

+#elif LLVM_VERSION < 35

       DataLayout *TD;

+#else

+      const DataLayout *TD;

 #endif

       ScalarEvolution *SE;

       SCEVExpander *expander;

@@ -855,15 +909,23 @@ namespace llvm {

 INITIALIZE_PASS_BEGIN(PtrVerifier, "", "", false, false)

 #if LLVM_VERSION < 32

 INITIALIZE_PASS_DEPENDENCY(TargetData)

-#else

+#elif LLVM_VERSION < 35

 INITIALIZE_PASS_DEPENDENCY(DataLayout)

+#else

+INITIALIZE_PASS_DEPENDENCY(DataLayoutPass)

 #endif

+#if LLVM_VERSION < 35

 INITIALIZE_PASS_DEPENDENCY(DominatorTree)

+#else

+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)

+#endif

 INITIALIZE_PASS_DEPENDENCY(ScalarEvolution)

 #if LLVM_VERSION < 34

 INITIALIZE_AG_DEPENDENCY(CallGraph)

-#else

+#elif LLVM_VERSION < 35

 INITIALIZE_PASS_DEPENDENCY(CallGraph)

+#else

+INITIALIZE_PASS_DEPENDENCY(CallGraphWrapperPass)

 #endif

 INITIALIZE_PASS_DEPENDENCY(PointerTracking)

 INITIALIZE_PASS_END(PtrVerifier, "clambc-rtchecks", "ClamBC RTchecks", false, false)

@@ -16,15 +16,19 @@

 #ifndef _WIN32

 #include "llvm/Analysis/ConstantFolding.h"

-#include "llvm/Analysis/Dominators.h"

 #include "llvm/Analysis/LoopInfo.h"

 #include "llvm/Analysis/MemoryBuiltins.h"

 #include "llvm/Analysis/ValueTracking.h"

 #include "PointerTracking.h"

 #include "llvm/Analysis/ScalarEvolution.h"

 #include "llvm/Analysis/ScalarEvolutionExpressions.h"

+#if LLVM_VERSION < 35

 #include "llvm/Support/CallSite.h"

 #include "llvm/Support/InstIterator.h"

+#else

+#include "llvm/IR/CallSite.h"

+#include "llvm/IR/InstIterator.h"

+#endif

 #include "llvm/Support/raw_ostream.h"

 #include "llvm/Target/TargetLibraryInfo.h"

@@ -61,10 +65,18 @@ namespace llvm {

 };

 INITIALIZE_PASS_BEGIN(PointerTracking, "pointertracking",

                 "Track pointer bounds", false, true)

+#if LLVM_VERSION < 35

 INITIALIZE_PASS_DEPENDENCY(DominatorTree)

+#else

+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)

+#endif

 INITIALIZE_PASS_DEPENDENCY(LoopInfo)

 INITIALIZE_PASS_DEPENDENCY(ScalarEvolution)

+#if LLVM_VERSION < 35

 INITIALIZE_PASS_DEPENDENCY(DominatorTree)

+#else

+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)

+#endif

 INITIALIZE_PASS_END(PointerTracking, "pointertracking",

                 "Track pointer bounds", false, true)

 #endif

@@ -82,17 +94,28 @@ bool PointerTracking::runOnFunction(Function &F) {

   FF = &F;

 #if LLVM_VERSION < 32

   TD = getAnalysisIfAvailable<TargetData>();

-#else

+#elif LLVM_VERSION < 35

   TD = getAnalysisIfAvailable<DataLayout>();

+#else

+  DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>();

+  TD = DLP ? &DLP->getDataLayout() : 0;

 #endif

   SE = &getAnalysis<ScalarEvolution>();

   LI = &getAnalysis<LoopInfo>();

+#if LLVM_VERSION < 35

   DT = &getAnalysis<DominatorTree>();

+#else

+  DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();

+#endif

   return false;

 }

 void PointerTracking::getAnalysisUsage(AnalysisUsage &AU) const {

+#if LLVM_VERSION < 35

   AU.addRequiredTransitive<DominatorTree>();

+#else

+  AU.addRequiredTransitive<DominatorTreeWrapperPass>();

+#endif

   AU.addRequiredTransitive<LoopInfo>();

   AU.addRequiredTransitive<ScalarEvolution>();

   AU.setPreservesAll();

@@ -28,9 +28,15 @@

 #define LLVM_ANALYSIS_POINTERTRACKING_H

 #include "llvm/ADT/SmallPtrSet.h"

+#if LLVM_VERSION < 35

 #include "llvm/Analysis/Dominators.h"

-#include "llvm/Pass.h"

 #include "llvm/Support/PredIteratorCache.h"

+#else

+#include "llvm/IR/Dominators.h"

+#include "llvm/IR/PredIteratorCache.h"

+#include "llvm/IR/DataLayout.h"

+#endif

+#include "llvm/Pass.h"

 #include "llvm30_compat.h"

 #if LLVM_VERSION < 33

@@ -117,8 +123,10 @@ namespace llvm {

     Function *FF;

 #if LLVM_VERSION < 32

     TargetData *TD;

-#else

+#elif LLVM_VERSION < 35

     DataLayout *TD;

+#else

+    const DataLayout *TD;

 #endif

     ScalarEvolution *SE;

     LoopInfo *LI;

@@ -44,8 +44,15 @@

 #include "llvm/ADT/SmallVector.h"

 #include "llvm/Analysis/LoopInfo.h"

 #include "llvm/Analysis/ScalarEvolution.h"

+#if LLVM_VERSION < 35

 #include "llvm/Analysis/Verifier.h"

 #include "llvm/AutoUpgrade.h"

+#include "llvm/Support/TargetFolder.h"

+#else

+#include "llvm/IR/Verifier.h"

+#include "llvm/IR/AutoUpgrade.h"

+#include "llvm/Analysis/TargetFolder.h"

+#endif

 #include "llvm/ExecutionEngine/ExecutionEngine.h"

 #include "llvm/ExecutionEngine/JIT.h"

 #include "llvm/ExecutionEngine/JITEventListener.h"

@@ -100,15 +107,16 @@ void LLVMInitializePowerPCAsmPrinter();

 #endif

 #include "llvm/Target/TargetOptions.h"

-#include "llvm/Support/TargetFolder.h"

 #include "llvm/Transforms/Scalar.h"

 #include "llvm/Transforms/IPO.h"

 #include "llvm/Transforms/Utils/BasicBlockUtils.h"

 #if LLVM_VERSION < 32

 #include "llvm/Analysis/DebugInfo.h"

-#else

+#elif LLVM_VERSION < 35

 #include "llvm/DebugInfo.h"

+#else

+#include "llvm/IR/DebugInfo.h"

 #endif

 #if LLVM_VERSION < 32

@@ -144,6 +152,10 @@ void LLVMInitializePowerPCAsmPrinter();

 #include "llvm/Analysis/CFG.h"

 #endif

+#if LLVM_VERSION >= 35

+#include "llvm/IR/Dominators.h"

+#endif

+

 //#define TIMING

 #undef TIMING

@@ -657,7 +669,11 @@ public:

 	}

 	BBSetTy  needsTimeoutCheck;

 	BBMapTy BBMap;

+#if LLVM_VERSION < 35

 	DominatorTree &DT = getAnalysis<DominatorTree>();

+#else

+	DominatorTree &DT = getAnalysis<DominatorTreeWrapperPass>().getDomTree();

+#endif

 	for (Function::iterator I=F.begin(),E=F.end(); I != E; ++I) {

 	    BasicBlock *BB = &*I;

 	    unsigned apicalls = 0;

@@ -784,7 +800,11 @@ public:

       AU.setPreservesAll();

       AU.addRequired<LoopInfo>();

       AU.addRequired<ScalarEvolution>();

+#if LLVM_VERSION < 35

       AU.addRequired<DominatorTree>();

+#else

+      AU.addRequired<DominatorTreeWrapperPass>();

+#endif

     }

 };

 char RuntimeLimits::ID;

@@ -1856,7 +1876,11 @@ public:

 	    // If successful so far, run verifyFunction

 	    if (!broken) {

+#if LLVM_VERSION < 35

 		if (verifyFunction(*F, PrintMessageAction)) {

+#else

+		if (verifyFunction(*F, &errs())) {

+#endif

 		    // verification failed

 		    broken = true;

 		    cli_warnmsg("[Bytecode JIT]: Verification failed\n");

@@ -1945,7 +1969,11 @@ public:

 	ReturnInst::Create(Context, CI, BB);

 	delete [] Functions;

+#if LLVM_VERSION < 35

 	if (verifyFunction(*F, PrintMessageAction))

+#else

+	if (verifyFunction(*F, &errs()))

+#endif

 	    return 0;

 /*			DEBUG(errs() << "Generating code\n");

@@ -2125,7 +2153,11 @@ static void addFunctionProtos(struct CommonFunctions *CF, ExecutionEngine *EE, M

 INITIALIZE_PASS_BEGIN(RuntimeLimits, "rl", "Runtime Limits", false, false)

 INITIALIZE_PASS_DEPENDENCY(LoopInfo)

 INITIALIZE_PASS_DEPENDENCY(ScalarEvolution)

+#if LLVM_VERSION < 35

 INITIALIZE_PASS_DEPENDENCY(DominatorTree)

+#else

+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)

+#endif

 INITIALIZE_PASS_END(RuntimeLimits, "rl" ,"Runtime Limits", false, false)

 #endif

@@ -2341,16 +2373,20 @@ static void setGuard(unsigned char* guardbuf)

 }

 #if LLVM_VERSION < 32

 static void addFPasses(FunctionPassManager &FPM, bool trusted, const TargetData *TD)

-#else

+#elif LLVM_VERSION < 35

 static void addFPasses(FunctionPassManager &FPM, bool trusted, const DataLayout *TD)

+#else

+static void addFPasses(FunctionPassManager &FPM, bool trusted, const Module *M)

 #endif

 {

     // Set up the optimizer pipeline.  Start with registering info about how

     // the target lays out data structures.

 #if LLVM_VERSION < 32

     FPM.add(new TargetData(*TD));

-#else

+#elif LLVM_VERSION < 35

     FPM.add(new DataLayout(*TD));

+#else

+    FPM.add(new DataLayoutPass(M));

 #endif

     // Promote allocas to registers.

     FPM.add(createPromoteMemoryToRegisterPass());

@@ -2428,9 +2464,12 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)

 #if LLVM_VERSION < 32

 	addFPasses(OurFPM, true, EE->getTargetData());

 	addFPasses(OurFPMUnsigned, false, EE->getTargetData());

-#else

+#elif LLVM_VERSION < 35

 	addFPasses(OurFPM, true, EE->getDataLayout());

 	addFPasses(OurFPMUnsigned, false, EE->getDataLayout());

+#else

+	addFPasses(OurFPM, true, M);

+	addFPasses(OurFPMUnsigned, false, M);

 #endif

@@ -2541,8 +2580,10 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)

 	PassManager PM;

 #if LLVM_VERSION < 32

 	PM.add(new TargetData(*EE->getTargetData()));

-#else

+#elif LLVM_VERSION < 35

 	PM.add(new DataLayout(*EE->getDataLayout()));

+#else

+	PM.add(new DataLayoutPass(M));

 #endif

 	// TODO: only run this on the untrusted bytecodes, not all of them...

 	if (has_untrusted)

@@ -2601,10 +2642,17 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)

 int bytecode_init(void)

 {

     // If already initialized return

+#if LLVM_VERSION < 35

     if (llvm_is_multithreaded()) {

 	cli_warnmsg("bytecode_init: already initialized\n");

 	return CL_EARG;

     }

+#else

+    if (!LLVMIsMultithreaded()) {

+        cli_warnmsg("bytecode_init: LLVM is compiled without multithreading support\n");

+    }

+#endif

+

     llvm_install_error_handler(llvm_error_handler);

 #ifdef CL_DEBUG

     sys::PrintStackTraceOnErrorSignal();

@@ -2628,7 +2676,11 @@ int bytecode_init(void)

 #endif

     llvm::DwarfExceptionHandling = false;

 #endif

+#if LLVM_VERSION < 33

     llvm_start_multithreaded();

+#else

+    // This is now deprecated/useless: Multi-threading can only be enabled/disabled with the compile time define LLVM_ENABLE_THREADS in LLVM.

+#endif

     // If we have a native target, initialize it to ensure it is linked in and

     // usable by the JIT.

@@ -2638,7 +2690,11 @@ int bytecode_init(void)

     InitializeAllTargets();

 #endif

+#if LLVM_VERSION < 35

     if (!llvm_is_multithreaded()) {

+#else

+    if (!LLVMIsMultithreaded()) {

+#endif

 	//TODO:cli_dbgmsg

 	DEBUG(errs() << "WARNING: ClamAV JIT built w/o atomic builtins\n"

 	      << "On x86 for best performance ClamAV should be built for i686, not i386!\n");

@@ -2710,7 +2766,7 @@ void cli_bytecode_debug_printsrc(const struct cli_bc_ctx *ctx)

 	std::string ErrorMessage;

 #if LLVM_VERSION < 29

 	lines->buffer = MemoryBuffer::getFile(path, &ErrorMessage);

-#else

+#elif LLVM_VERSION < 35

 	OwningPtr<MemoryBuffer> File;

 	error_code ec = MemoryBuffer::getFile(path, File);

 	if (ec) {

@@ -2718,6 +2774,15 @@ void cli_bytecode_debug_printsrc(const struct cli_bc_ctx *ctx)

 	    lines->buffer = 0;

 	} else

 	    lines->buffer = File.take();

+#else

+	ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr = MemoryBuffer::getFile(path);

+	if (!FileOrErr) {

+		// TODO: How to handle ErrorMessage?

+		lines->buffer = 0;

+	}

+	else {

+		lines->buffer = FileOrErr.get().release();

+	}

 #endif

 	if (!lines->buffer) {

 	    errs() << "Unable to open file '" << path << "'\n";

@@ -2863,7 +2928,10 @@ static bool getLocationInfo(const Value *V, std::string &DisplayName,

   StringRef G;

   StringRef H;

 #endif

+#if LLVM_VERSION < 35

   DIType TypeD;

+#endif

+  StringRef T;

   if (GlobalVariable *GV = dyn_cast<GlobalVariable>(const_cast<Value*>(V))) {

     Value *DIGV = findDbgGlobalDeclare(GV);

@@ -2880,7 +2948,11 @@ static bool getLocationInfo(const Value *V, std::string &DisplayName,

     G = Var.getFilename();

     H = Var.getDirectory();

 #endif

+#if LLVM_VERSION < 35

     TypeD = Var.getType();

+#else

+    T = Var.getType().getName();

+#endif

   } else if (Function *F = dyn_cast<Function>(const_cast<Value*>(V))){

     Value *DIF = findDbgSubprogramDeclare(F);

     if (!DIF) return false;

@@ -2896,7 +2968,11 @@ static bool getLocationInfo(const Value *V, std::string &DisplayName,

     G = Var.getFilename();

     H = Var.getDirectory();

 #endif

+#if LLVM_VERSION < 35

     TypeD = Var.getType();

+#else

+    T = Var.getType().getName();

+#endif

   } else {

     const DbgDeclareInst *DDI = findDbgDeclare(V);

     if (!DDI) return false;

@@ -2913,10 +2989,16 @@ static bool getLocationInfo(const Value *V, std::string &DisplayName,

     G = StringRef();

     H = StringRef();

 #endif

+#if LLVM_VERSION < 35

     TypeD = Var.getType();

+#else

+    T = Var.getType().getName();

+#endif

   }

-  StringRef T = TypeD.getName();

+#if LLVM_VERSION < 35

+  T = TypeD.getName();

+#endif

   if (!T.empty())

     Type = T;

 #if LLVM_VERSION < 33

@@ -110,9 +110,9 @@ if test "x$packaged_llvm" = "xyes"; then

 elif test $llvmver_test -lt 290; then

     AC_MSG_RESULT([no ($llvmver)])

     AC_MSG_ERROR([LLVM >= 2.9 required, but "$llvmver"($llvmver_test) found])

-elif test $llvmver_test -gt 342; then

+elif test $llvmver_test -ge 360; then

     AC_MSG_RESULT([no ($llvmver)])

-    AC_MSG_ERROR([LLVM <= 3.4.2 required, but "$llvmver"($llvmver_test) found])

+    AC_MSG_ERROR([LLVM < 3.6 required, but "$llvmver"($llvmver_test) found])

 else

     AC_MSG_RESULT([ok ($llvmver)])

 fi