[vmkit-commits] [vmkit] r99144 - in /vmkit/trunk/lib/J3/Compiler: JavaLLVMCompiler.cpp LLVMMaterializer.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Mar 21 15:43:53 2010
New Revision: 99144

URL: http://llvm.org/viewvc/llvm-project?rev=99144&view=rev
Log:
Fix build with new LLVM API.


Modified:
    vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/LLVMMaterializer.cpp

Modified: vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp?rev=99144&r1=99143&r2=99144&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp Sun Mar 21 15:43:53 2010
@@ -89,7 +89,7 @@
 MDNode* JavaLLVMCompiler::GetDbgSubprogram(JavaMethod* meth) {
   if (getMethodInfo(meth)->getDbgSubprogram() == NULL) {
     MDNode* node = DebugFactory->CreateSubprogram(DIDescriptor(), "", "",
-                                                  "", DICompileUnit(), 0,
+                                                  "", DIFile(), 0,
                                                   DIType(), false,
                                                   false).getNode();
     DbgInfos.insert(std::make_pair(node, meth));

Modified: vmkit/trunk/lib/J3/Compiler/LLVMMaterializer.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LLVMMaterializer.cpp?rev=99144&r1=99143&r2=99144&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LLVMMaterializer.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LLVMMaterializer.cpp Sun Mar 21 15:43:53 2010
@@ -119,16 +119,18 @@
   // by the pass manager, and we don't want another thread to JIT the
   // function while all passes have not been run.
   if (!(F->isDeclaration())) {
-    mvm::MvmModule::unprotectIR(); 
+    mvm::MvmModule::unprotectIR();
+    // TODO: Is this still valid?
     // Reacquire and go back to the JIT function.
-    mvm::MvmModule::executionEngine->lock.acquire();
+    // mvm::MvmModule::executionEngine->lock.acquire();
     return false;
   }
 
   if (mvm::MvmModule::executionEngine->getPointerToGlobalIfAvailable(F)) {
     mvm::MvmModule::unprotectIR(); 
+    // TODO: Is this still valid?
     // Reacquire and go back to the JIT function.
-    mvm::MvmModule::executionEngine->lock.acquire();
+    // mvm::MvmModule::executionEngine->lock.acquire();
     return false;
   }
   
@@ -160,8 +162,9 @@
 
   mvm::MvmModule::unprotectIR();
   
+  // TODO: Is this still valid?
   // Reacquire to go back to the JIT function.
-  mvm::MvmModule::executionEngine->lock.acquire();
+  // mvm::MvmModule::executionEngine->lock.acquire();
   
   if (F->isDeclaration())
     mvm::MvmModule::executionEngine->updateGlobalMapping(F, val);