From 30481e275c63e0d406abe5c4f6addcf403bc1b39 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Thu, 30 Apr 2009 23:01:58 +0000 Subject: [PATCH] Set FnEnd in JITEmitter::finishFunction to point strictly to the end of function's machine code. Don't include memory allocated for global variables during relocations resolution. llvm-svn: 70517 --- llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp index afb89e7fb387..7356df4e4f7b 100644 --- a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -1051,6 +1051,9 @@ bool JITEmitter::finishFunction(MachineFunction &F) { unsigned char *FnStart = (unsigned char *)TheJIT->getPointerToGlobalIfAvailable(F.getFunction()); + // FnEnd is the end of the function's machine code. + unsigned char *FnEnd = CurBufferPtr; + if (!Relocations.empty()) { CurFn = F.getFunction(); NumRelos += Relocations.size(); @@ -1128,9 +1131,9 @@ bool JITEmitter::finishFunction(MachineFunction &F) { } } - unsigned char *FnEnd = CurBufferPtr; - - MemMgr->endFunctionBody(F.getFunction(), BufferBegin, FnEnd); + // CurBufferPtr may have moved beyond FnEnd, due to memory allocation for + // global variables that were referenced in the relocations. + MemMgr->endFunctionBody(F.getFunction(), BufferBegin, CurBufferPtr); if (CurBufferPtr == BufferEnd) { // FIXME: Allocate more space, then try again.