diff options
author | Andrew Kaylor <andrew.kaylor@intel.com> | 2013-10-21 17:42:06 +0000 |
---|---|---|
committer | Andrew Kaylor <andrew.kaylor@intel.com> | 2013-10-21 17:42:06 +0000 |
commit | 6169453ba37ac353655f2475f336e66f31276752 (patch) | |
tree | 41bbad7ba9a1eb1b2afbc0157de173b7ab893733 /lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | |
parent | 770530babc78e444bb6d0aadc87702ef138293fd (diff) | |
download | llvm-6169453ba37ac353655f2475f336e66f31276752.tar.gz llvm-6169453ba37ac353655f2475f336e66f31276752.tar.bz2 llvm-6169453ba37ac353655f2475f336e66f31276752.tar.xz |
Improving MCJIT/RuntimeDyld thread safety
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193094 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp')
-rw-r--r-- | lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp index 07de4ba8cd..f40bed1b3f 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -19,6 +19,7 @@ #include "RuntimeDyldMachO.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/MathExtras.h" +#include "llvm/Support/MutexGuard.h" #include "llvm/Object/ELF.h" using namespace llvm; @@ -37,6 +38,8 @@ void RuntimeDyldImpl::deregisterEHFrames() { // Resolve the relocations for all symbols we currently know about. void RuntimeDyldImpl::resolveRelocations() { + MutexGuard locked(lock); + // First, resolve relocations associated with external symbols. resolveExternalSymbols(); @@ -57,6 +60,7 @@ void RuntimeDyldImpl::resolveRelocations() { void RuntimeDyldImpl::mapSectionAddress(const void *LocalAddress, uint64_t TargetAddress) { + MutexGuard locked(lock); for (unsigned i = 0, e = Sections.size(); i != e; ++i) { if (Sections[i].Address == LocalAddress) { reassignSectionAddress(i, TargetAddress); @@ -73,6 +77,8 @@ ObjectImage *RuntimeDyldImpl::createObjectImage(ObjectBuffer *InputBuffer) { } ObjectImage *RuntimeDyldImpl::loadObject(ObjectBuffer *InputBuffer) { + MutexGuard locked(lock); + OwningPtr<ObjectImage> obj(createObjectImage(InputBuffer)); if (!obj) report_fatal_error("Unable to create object image from memory buffer!"); |