maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Dan Gohman 2009-02-19 02:40:15 +00:00
parent 5d2534ada7
commit 6c109b4979
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/ExecutionEngine/JIT/JIT.cpp
View File

@ -553,6 +553,8 @@ void *JIT::getPointerToFunction(Function *F) {
if (void *Addr = getPointerToGlobalIfAvailable(F)) if (void *Addr = getPointerToGlobalIfAvailable(F))
return Addr; // Check if function already code gen'd 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. // Make sure we read in the function if it exists in this Module.
if (F->hasNotBeenReadFromBitcode()) { if (F->hasNotBeenReadFromBitcode()) {
// Determine the module provider this function is provided by. // Determine the module provider this function is provided by.
@ -578,8 +580,6 @@ void *JIT::getPointerToFunction(Function *F) {
return Addr; return Addr;
} }
MutexGuard locked(lock);
if (F->isDeclaration()) { if (F->isDeclaration()) {
bool AbortOnFailure = F->getLinkage() != GlobalValue::ExternalWeakLinkage; bool AbortOnFailure = F->getLinkage() != GlobalValue::ExternalWeakLinkage;
void *Addr = getPointerToNamedFunction(F->getName(), AbortOnFailure); void *Addr = getPointerToNamedFunction(F->getName(), AbortOnFailure);