Reapply r57340. VMKit does not presently rely on materializeFunction

being called with the lock released, and this fixes a race condition
in the JIT as used by lli.

llvm-svn: 64997

1 files changed, 2 insertions, 2 deletions

diff --git a/llvm/lib/ExecutionEngine/JIT/JIT.cpp b/llvm/lib/ExecutionEngine/JIT/JIT.cpp
index 6940d85d757..0f98ddcabb3 100644
--- a/llvm/lib/ExecutionEngine/JIT/JIT.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/JIT.cpp
@@ -553,6 +553,8 @@ void *JIT::getPointerToFunction(Function *F) {
   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.
@@ -578,8 +580,6 @@ void *JIT::getPointerToFunction(Function *F) {
       return Addr;
   }
 
-  MutexGuard locked(lock);
-
   if (F->isDeclaration()) {
     bool AbortOnFailure = F->getLinkage() != GlobalValue::ExternalWeakLinkage;
     void *Addr = getPointerToNamedFunction(F->getName(), AbortOnFailure);