[llvm-commits] [llvm] r57356 - /llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp

Mon P Wang wangmp at apple.com
Fri Oct 10 11:07:10 PDT 2008


Author: wangmp
Date: Fri Oct 10 13:07:10 2008
New Revision: 57356

URL: http://llvm.org/viewvc/llvm-project?rev=57356&view=rev
Log:
Revert r57340 move guard mutex in getPointerToFunction as this can cause
deadlock issues with java

Modified:
    llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp

Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp?rev=57356&r1=57355&r2=57356&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp Fri Oct 10 13:07:10 2008
@@ -489,8 +489,6 @@
   if (void *Addr = getPointerToGlobalIfAvailable(F))
     return Addr;   // Check if function already code gen'd
 
-  MutexGuard locked(lock);
-
   // Make sure we read in the function if it exists in this Module.
   if (F->hasNotBeenReadFromBitcode()) {
     // Determine the module provider this function is provided by.
@@ -516,6 +514,8 @@
     return Addr;
   }
 
+  MutexGuard locked(lock);
+
   if (F->isDeclaration()) {
     void *Addr = getPointerToNamedFunction(F->getName());
     addGlobalMapping(F, Addr);





More information about the llvm-commits mailing list