diff options
| -rw-r--r-- | lib/ExecutionEngine/JIT/Callback.cpp | 1 | ||||
| -rw-r--r-- | lib/ExecutionEngine/JIT/JITEmitter.cpp | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/ExecutionEngine/JIT/Callback.cpp b/lib/ExecutionEngine/JIT/Callback.cpp index 75abf435e6..fc13a10855 100644 --- a/lib/ExecutionEngine/JIT/Callback.cpp +++ b/lib/ExecutionEngine/JIT/Callback.cpp @@ -46,7 +46,6 @@ void VM::CompilationCallback() { #endif } - void VM::registerCallback() { TheVM = this; } diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp index d6f75c08f7..69e2453090 100644 --- a/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -131,11 +131,15 @@ void Emitter::emitAddress(void *Addr, bool isPCRelative) { void Emitter::emitGlobalAddress(GlobalValue *V, bool isPCRelative) { if (isPCRelative) { // must be a call, this is a major hack! - // FIXME: Try looking up the function to see if it is already compiled! - TheVM.addFunctionRef(CurByte, cast<Function>(V)); - - // Delayed resolution... - emitAddress((void*)VM::CompilationCallback, isPCRelative); + // Try looking up the function to see if it is already compiled! + if (void *Addr = TheVM.getPointerToGlobalIfAvailable(V)) { + emitAddress(Addr, isPCRelative); + } else { // Function has not yet been code generated! + TheVM.addFunctionRef(CurByte, cast<Function>(V)); + + // Delayed resolution... + emitAddress((void*)VM::CompilationCallback, isPCRelative); + } } else { emitAddress(TheVM.getPointerToGlobal(V), isPCRelative); } |