summaryrefslogtreecommitdiffstats
path: root/llvm/tools/lli/RemoteMemoryManager.cpp
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2014-11-26 06:53:26 +0000
committerLang Hames <lhames@gmail.com>2014-11-26 06:53:26 +0000
commit829a19ae74c572bdb5e46b4e4b85a35503255c94 (patch)
treeb1eac9db4b702227031bb68af4ee1b9b34b256ce /llvm/tools/lli/RemoteMemoryManager.cpp
parentbf82611bc8fa3d384a2a73cbfc898cf67db5edd7 (diff)
downloadbcm5719-llvm-829a19ae74c572bdb5e46b4e4b85a35503255c94.tar.gz
bcm5719-llvm-829a19ae74c572bdb5e46b4e4b85a35503255c94.zip
[MCJIT] Clean up RuntimeDyld's quirky object-ownership/modification scheme.
Previously, when loading an object file, RuntimeDyld (1) took ownership of the ObjectFile instance (and associated MemoryBuffer), (2) potentially modified the object in-place, and (3) returned an ObjectImage that managed ownership of the now-modified object and provided some convenience methods. This scheme accreted over several years as features were tacked on to RuntimeDyld, and was both unintuitive and unsafe (See e.g. http://llvm.org/PR20722). This patch fixes the issue by removing all ownership and in-place modification of object files from RuntimeDyld. Existing behavior, including debugger registration, is preserved. Noteworthy changes include: (1) ObjectFile instances are now passed to RuntimeDyld by const-ref. (2) The ObjectImage and ObjectBuffer classes have been removed entirely, they existed to model ownership within RuntimeDyld, and so are no longer needed. (3) RuntimeDyld::loadObject now returns an instance of a new class, RuntimeDyld::LoadedObjectInfo, which can be used to construct a modified object suitable for registration with the debugger, following the existing debugger registration scheme. (4) The JITRegistrar class has been removed, and the GDBRegistrar class has been re-written as a JITEventListener. This should fix http://llvm.org/PR20722 . llvm-svn: 222810
Diffstat (limited to 'llvm/tools/lli/RemoteMemoryManager.cpp')
-rw-r--r--llvm/tools/lli/RemoteMemoryManager.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/tools/lli/RemoteMemoryManager.cpp b/llvm/tools/lli/RemoteMemoryManager.cpp
index 5a135eabd73..47da8fb60c9 100644
--- a/llvm/tools/lli/RemoteMemoryManager.cpp
+++ b/llvm/tools/lli/RemoteMemoryManager.cpp
@@ -14,7 +14,6 @@
#include "RemoteMemoryManager.h"
#include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "llvm/ExecutionEngine/ObjectImage.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Format.h"
@@ -78,7 +77,7 @@ sys::MemoryBlock RemoteMemoryManager::allocateSection(uintptr_t Size) {
}
void RemoteMemoryManager::notifyObjectLoaded(ExecutionEngine *EE,
- const ObjectImage *Obj) {
+ const object::ObjectFile &Obj) {
// The client should have called setRemoteTarget() before triggering any
// code generation.
assert(Target);
OpenPOWER on IntegriCloud