[ORC] Guard access to the MemMgrs vector in RTDyldObjectLinkingLayer.
Otherwise we can end up with a data-race when linking concurrently.
This should fix an intermittent failure in the multiple-compile-threads-basic.ll
testcase.
llvm-svn: 344956
diff --git a/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp b/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
index 8511e41..616251c 100644
--- a/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
@@ -121,8 +121,15 @@
}
auto K = R.getVModuleKey();
- MemMgrs.push_back(GetMemoryManager());
- auto &MemMgr = *MemMgrs.back();
+ RuntimeDyld::MemoryManager *MemMgr = nullptr;
+
+ // Create a record a memory manager for this object.
+ {
+ auto Tmp = GetMemoryManager();
+ std::lock_guard<std::mutex> Lock(RTDyldLayerMutex);
+ MemMgrs.push_back(std::move(Tmp));
+ MemMgr = MemMgrs.back().get();
+ }
JITDylibSearchOrderResolver Resolver(*SharedR);
@@ -134,7 +141,7 @@
* duplicate defs.
*/
jitLinkForORC(
- **Obj, std::move(O), MemMgr, Resolver, ProcessAllSections,
+ **Obj, std::move(O), *MemMgr, Resolver, ProcessAllSections,
[this, K, SharedR, &Obj, InternalSymbols](
std::unique_ptr<RuntimeDyld::LoadedObjectInfo> LoadedObjInfo,
std::map<StringRef, JITEvaluatedSymbol> ResolvedSymbols) {