diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2009-04-30 23:01:58 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2009-04-30 23:01:58 +0000 |
| commit | 19fee415f63ddb78fca703085fe56510be3e058c (patch) | |
| tree | 5881507ec613b2b8ec6a141be009c837048136bc /lib | |
| parent | 714257f5deec6049a4170bdd77ca1c3df989d67e (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@70517 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ExecutionEngine/JIT/JITEmitter.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp index afb89e7fb3..7356df4e4f 100644 --- a/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/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. |