[ORC] Consolidate RTDyldObjectLinkingLayer GetMemMgr and GetResolver into a
unified GetResources callback.
Having a single 'GetResources' callback will simplify adding new resources in
the future.
llvm-svn: 325180
diff --git a/llvm/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp
index 9b9bedb..740abed 100644
--- a/llvm/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp
@@ -70,9 +70,10 @@
SymbolStringPool SSP;
ExecutionSession ES(SSP);
- RTDyldObjectLinkingLayer ObjLayer(
- ES, [&MM](VModuleKey) { return MM; },
- [](orc::VModuleKey) { return std::make_shared<NullResolver>(); });
+ RTDyldObjectLinkingLayer ObjLayer(ES, [&MM](VModuleKey) {
+ return RTDyldObjectLinkingLayer::Resources{
+ MM, std::make_shared<NullResolver>()};
+ });
LLVMContext Context;
auto M = llvm::make_unique<Module>("", Context);
@@ -131,15 +132,13 @@
std::map<orc::VModuleKey, std::shared_ptr<orc::SymbolResolver>> Resolvers;
- RTDyldObjectLinkingLayer ObjLayer(ES, [&MM](VModuleKey) { return MM; },
- [&](VModuleKey K) {
- auto I = Resolvers.find(K);
- assert(I != Resolvers.end() &&
- "Missing resolver");
- auto R = std::move(I->second);
- Resolvers.erase(I);
- return R;
- });
+ RTDyldObjectLinkingLayer ObjLayer(ES, [&](VModuleKey K) {
+ auto I = Resolvers.find(K);
+ assert(I != Resolvers.end() && "Missing resolver");
+ auto R = std::move(I->second);
+ Resolvers.erase(I);
+ return RTDyldObjectLinkingLayer::Resources{MM, std::move(R)};
+ });
SimpleCompiler Compile(*TM);
// Create a pair of modules that will trigger recursive finalization:
@@ -220,9 +219,10 @@
auto MM = std::make_shared<SectionMemoryManagerWrapper>();
- RTDyldObjectLinkingLayer ObjLayer(
- ES, [&MM](VModuleKey) { return MM; },
- [](VModuleKey) { return std::make_shared<NullResolver>(); });
+ RTDyldObjectLinkingLayer ObjLayer(ES, [&MM](VModuleKey K) {
+ return RTDyldObjectLinkingLayer::Resources{
+ MM, std::make_shared<NullResolver>()};
+ });
SimpleCompiler Compile(*TM);
// Create a pair of unrelated modules:
@@ -283,8 +283,11 @@
SymbolStringPool SSP;
ExecutionSession ES(SSP);
RTDyldObjectLinkingLayer ObjLayer(
- ES, [](VModuleKey) { return nullptr; },
- [](VModuleKey) { return std::make_shared<NullResolver>(); },
+ ES,
+ [](VModuleKey) {
+ return RTDyldObjectLinkingLayer::Resources{
+ nullptr, std::make_shared<NullResolver>()};
+ },
[](VModuleKey, const RTDyldObjectLinkingLayer::ObjectPtr &obj,
const RuntimeDyld::LoadedObjectInfo &info) {});
}