diff options
| author | Andrew Kaylor <andrew.kaylor@intel.com> | 2013-10-11 21:25:48 +0000 |
|---|---|---|
| committer | Andrew Kaylor <andrew.kaylor@intel.com> | 2013-10-11 21:25:48 +0000 |
| commit | 528f6d787b1a847e61eb2f1114559f423fdeb68c (patch) | |
| tree | 7570a5af47ba322b7fa97459017f88717c4ad35c /lib/ExecutionEngine/MCJIT/MCJIT.cpp | |
| parent | b19b474de95112f7e0fc15ab87ad284889d19cd9 (diff) | |
| download | external_llvm-528f6d787b1a847e61eb2f1114559f423fdeb68c.zip external_llvm-528f6d787b1a847e61eb2f1114559f423fdeb68c.tar.gz external_llvm-528f6d787b1a847e61eb2f1114559f423fdeb68c.tar.bz2 | |
Adding multiple object support to MCJIT EH frame handling
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192504 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/MCJIT/MCJIT.cpp')
| -rw-r--r-- | lib/ExecutionEngine/MCJIT/MCJIT.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 541ba9e..fa2c984 100644 --- a/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -178,14 +178,12 @@ void MCJIT::finalizeLoadedModules() { if (ModuleStates[M].hasBeenLoaded() && !ModuleStates[M].hasBeenFinalized()) { - // FIXME: This should be module specific! - StringRef EHData = Dyld.getEHFrameSection(); - if (!EHData.empty()) - MemMgr.registerEHFrames(EHData); ModuleStates[M] = ModuleFinalized; } } + Dyld.registerEHFrames(); + // Set page permissions. MemMgr.finalizeMemory(); } @@ -221,14 +219,12 @@ void MCJIT::finalizeObject() { if (ModuleStates[M].hasBeenLoaded() && !ModuleStates[M].hasBeenFinalized()) { - // FIXME: This should be module specific! - StringRef EHData = Dyld.getEHFrameSection(); - if (!EHData.empty()) - MemMgr.registerEHFrames(EHData); ModuleStates[M] = ModuleFinalized; } } + Dyld.registerEHFrames(); + // Set page permissions. MemMgr.finalizeMemory(); } @@ -248,10 +244,7 @@ void MCJIT::finalizeModule(Module *M) { // Resolve any outstanding relocations. Dyld.resolveRelocations(); - // FIXME: Should this be module specific? - StringRef EHData = Dyld.getEHFrameSection(); - if (!EHData.empty()) - MemMgr.registerEHFrames(EHData); + Dyld.registerEHFrames(); // Set page permissions. MemMgr.finalizeMemory(); |