[vmkit-commits] [vmkit] r76470 - in /vmkit/trunk/lib: JnJVM/Compiler/JnjvmModule.cpp Mvm/Compiler/JIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Jul 20 16:11:58 2009
New Revision: 76470

URL: http://llvm.org/viewvc/llvm-project?rev=76470&view=rev
Log:
Use the global context for now.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp

Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=76470&r1=76469&r2=76470&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Mon Jul 20 16:11:58 2009
@@ -62,7 +62,7 @@
 
 
 JavaLLVMCompiler::JavaLLVMCompiler(const std::string& str) :
-  TheModule(new llvm::Module(str, *(new llvm::LLVMContext()))),
+  TheModule(new llvm::Module(str, getGlobalContext())),
   JavaIntrinsics(TheModule) {
 
   enabledException = true;

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=76470&r1=76469&r2=76470&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon Jul 20 16:11:58 2009
@@ -55,7 +55,7 @@
   llvm::ExceptionHandling = false;
 #endif
   if (!M) {
-    globalModule = new Module("bootstrap module", *(new LLVMContext()));
+    globalModule = new Module("bootstrap module", getGlobalContext());
     globalModuleProvider = new ExistingModuleProvider (globalModule);
 
     InitializeNativeTarget();
@@ -231,7 +231,6 @@
 
 void MvmModule::runPasses(llvm::Function* func,
                           llvm::FunctionPassManager* pm) {
-  pm->doInitialization();
   pm->run(*func);
 }
 
@@ -289,6 +288,8 @@
   addPass(PM, createAggressiveDCEPass());        // Delete dead instructions
   addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   
+  PM->doInitialization();
+  
 }
 
 // We protect the creation of IR with the executionEngine lock because