[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 04d11afedb71a7f91925ab71a743cf6d3c96b38a
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Feb 15 18:34:40 2010 +0200

    Update to new LLVM API.
    
    ModuleProvider is gone!

diff --git a/libclamav/c++/bytecode2llvm.cpp b/libclamav/c++/bytecode2llvm.cpp
index c981451..a5508e0 100644
--- a/libclamav/c++/bytecode2llvm.cpp
+++ b/libclamav/c++/bytecode2llvm.cpp
@@ -35,7 +35,6 @@
 #include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
-#include "llvm/ModuleProvider.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/CommandLine.h"
@@ -1332,11 +1331,10 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)
   // LLVM itself never throws exceptions, but operator new may throw bad_alloc
   try {
     Module *M = new Module("ClamAV jit module", bcs->engine->Context);
-    ExistingModuleProvider *MP = new ExistingModuleProvider(M);
     {
 	// Create the JIT.
 	std::string ErrorMsg;
-	EngineBuilder builder(MP);
+	EngineBuilder builder(M);
 	builder.setErrorStr(&ErrorMsg);
 	builder.setEngineKind(EngineKind::JIT);
 	builder.setOptLevel(CodeGenOpt::Default);
@@ -1358,7 +1356,7 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)
 	struct CommonFunctions CF;
 	addFunctionProtos(&CF, EE, M);
 
-	FunctionPassManager OurFPM(MP);
+	FunctionPassManager OurFPM(M);
 	// Set up the optimizer pipeline.  Start with registering info about how
 	// the target lays out data structures.
 	OurFPM.add(new TargetData(*EE->getTargetData()));

-- 
Debian repository for ClamAV