diff options
Diffstat (limited to 'llvm/unittests/ExecutionEngine/Orc')
5 files changed, 73 insertions, 64 deletions
diff --git a/llvm/unittests/ExecutionEngine/Orc/LazyEmittingLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/LazyEmittingLayerTest.cpp index 88d12cd103a..cc67aa07b80 100644 --- a/llvm/unittests/ExecutionEngine/Orc/LazyEmittingLayerTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/LazyEmittingLayerTest.cpp @@ -22,7 +22,8 @@ struct MockBaseLayer { TEST(LazyEmittingLayerTest, Empty) { MockBaseLayer M; - llvm::orc::LazyEmittingLayer<MockBaseLayer> L(M); + llvm::orc::LazyEmittingLayer<MockBaseLayer> L( + llvm::AcknowledgeORCv1Deprecation, M); cantFail( L.addModule(llvm::orc::VModuleKey(), std::unique_ptr<llvm::Module>())); } diff --git a/llvm/unittests/ExecutionEngine/Orc/LegacyCompileOnDemandLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/LegacyCompileOnDemandLayerTest.cpp index 9a526071c84..06b96f9fd38 100644 --- a/llvm/unittests/ExecutionEngine/Orc/LegacyCompileOnDemandLayerTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/LegacyCompileOnDemandLayerTest.cpp @@ -76,7 +76,7 @@ TEST(LegacyCompileOnDemandLayerTest, FindSymbol) { }; llvm::orc::LegacyCompileOnDemandLayer<decltype(TestBaseLayer)> COD( - ES, TestBaseLayer, GetResolver, SetResolver, + AcknowledgeORCv1Deprecation, ES, TestBaseLayer, GetResolver, SetResolver, [](Function &F) { return std::set<Function *>{&F}; }, CallbackMgr, [] { return llvm::make_unique<DummyStubsManager>(); }, true); diff --git a/llvm/unittests/ExecutionEngine/Orc/LegacyRTDyldObjectLinkingLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/LegacyRTDyldObjectLinkingLayerTest.cpp index 04b6f2101b2..001019daa4b 100644 --- a/llvm/unittests/ExecutionEngine/Orc/LegacyRTDyldObjectLinkingLayerTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/LegacyRTDyldObjectLinkingLayerTest.cpp @@ -68,10 +68,11 @@ TEST(LegacyRTDyldObjectLinkingLayerTest, TestSetProcessAllSections) { ExecutionSession ES; - LegacyRTDyldObjectLinkingLayer ObjLayer(ES, [&MM](VModuleKey) { - return LegacyRTDyldObjectLinkingLayer::Resources{ - MM, std::make_shared<NullResolver>()}; - }); + LegacyRTDyldObjectLinkingLayer ObjLayer( + AcknowledgeORCv1Deprecation, ES, [&MM](VModuleKey) { + return LegacyRTDyldObjectLinkingLayer::Resources{ + MM, std::make_shared<NullResolver>()}; + }); LLVMContext Context; auto M = llvm::make_unique<Module>("", Context); @@ -130,13 +131,14 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoDuplicateFinalization) { std::map<orc::VModuleKey, std::shared_ptr<orc::SymbolResolver>> Resolvers; - LegacyRTDyldObjectLinkingLayer 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 LegacyRTDyldObjectLinkingLayer::Resources{MM, std::move(R)}; - }); + LegacyRTDyldObjectLinkingLayer ObjLayer( + AcknowledgeORCv1Deprecation, ES, [&](VModuleKey K) { + auto I = Resolvers.find(K); + assert(I != Resolvers.end() && "Missing resolver"); + auto R = std::move(I->second); + Resolvers.erase(I); + return LegacyRTDyldObjectLinkingLayer::Resources{MM, std::move(R)}; + }); SimpleCompiler Compile(*TM); // Create a pair of modules that will trigger recursive finalization: @@ -217,10 +219,11 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoPrematureAllocation) { auto MM = std::make_shared<SectionMemoryManagerWrapper>(); - LegacyRTDyldObjectLinkingLayer ObjLayer(ES, [&MM](VModuleKey K) { - return LegacyRTDyldObjectLinkingLayer::Resources{ - MM, std::make_shared<NullResolver>()}; - }); + LegacyRTDyldObjectLinkingLayer ObjLayer( + AcknowledgeORCv1Deprecation, ES, [&MM](VModuleKey K) { + return LegacyRTDyldObjectLinkingLayer::Resources{ + MM, std::make_shared<NullResolver>()}; + }); SimpleCompiler Compile(*TM); // Create a pair of unrelated modules: @@ -278,7 +281,7 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoPrematureAllocation) { TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, TestNotifyLoadedSignature) { ExecutionSession ES; LegacyRTDyldObjectLinkingLayer ObjLayer( - ES, + AcknowledgeORCv1Deprecation, ES, [](VModuleKey) { return LegacyRTDyldObjectLinkingLayer::Resources{ nullptr, std::make_shared<NullResolver>()}; diff --git a/llvm/unittests/ExecutionEngine/Orc/ObjectTransformLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/ObjectTransformLayerTest.cpp index 2b6b5a7670d..2ff7e91a732 100644 --- a/llvm/unittests/ExecutionEngine/Orc/ObjectTransformLayerTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/ObjectTransformLayerTest.cpp @@ -182,17 +182,19 @@ TEST(LegacyObjectTransformLayerTest, Main) { // Create one object transform layer using a transform (as a functor) // that allocates new objects, and deals in unique pointers. - LegacyObjectTransformLayer<MockBaseLayer, AllocatingTransform> T1(M); + LegacyObjectTransformLayer<MockBaseLayer, AllocatingTransform> T1( + llvm::AcknowledgeORCv1Deprecation, M); // Create a second object transform layer using a transform (as a lambda) // that mutates objects in place, and deals in naked pointers LegacyObjectTransformLayer<MockBaseLayer, - std::function<std::shared_ptr<MockObjectFile>( - std::shared_ptr<MockObjectFile>)>> - T2(M, [](std::shared_ptr<MockObjectFile> Obj) { - ++(*Obj); - return Obj; - }); + std::function<std::shared_ptr<MockObjectFile>( + std::shared_ptr<MockObjectFile>)>> + T2(llvm::AcknowledgeORCv1Deprecation, M, + [](std::shared_ptr<MockObjectFile> Obj) { + ++(*Obj); + return Obj; + }); // Test addObject with T1 (allocating) auto K1 = ES.allocateVModule(); @@ -281,22 +283,25 @@ TEST(LegacyObjectTransformLayerTest, Main) { }; // Construct the jit layers. - LegacyRTDyldObjectLinkingLayer BaseLayer(ES, [](VModuleKey) { - return LegacyRTDyldObjectLinkingLayer::Resources{ - std::make_shared<llvm::SectionMemoryManager>(), - std::make_shared<NullResolver>()}; - }); + LegacyRTDyldObjectLinkingLayer BaseLayer( + llvm::AcknowledgeORCv1Deprecation, ES, [](VModuleKey) { + return LegacyRTDyldObjectLinkingLayer::Resources{ + std::make_shared<llvm::SectionMemoryManager>(), + std::make_shared<NullResolver>()}; + }); auto IdentityTransform = [](std::unique_ptr<llvm::MemoryBuffer> Obj) { return Obj; }; LegacyObjectTransformLayer<decltype(BaseLayer), decltype(IdentityTransform)> - TransformLayer(BaseLayer, IdentityTransform); + TransformLayer(llvm::AcknowledgeORCv1Deprecation, BaseLayer, + IdentityTransform); auto NullCompiler = [](llvm::Module &) { return std::unique_ptr<llvm::MemoryBuffer>(nullptr); }; LegacyIRCompileLayer<decltype(TransformLayer), decltype(NullCompiler)> - CompileLayer(TransformLayer, NullCompiler); + CompileLayer(llvm::AcknowledgeORCv1Deprecation, TransformLayer, + NullCompiler); // Make sure that the calls from LegacyIRCompileLayer to LegacyObjectTransformLayer // compile. diff --git a/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp index cb02a91cb6c..4377d526779 100644 --- a/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp @@ -127,7 +127,8 @@ TEST(RemoteObjectLayer, AddObject) { std::copy(ObjBytes.begin(), ObjBytes.end(), ObjContents.begin()); RPCEndpoint ClientEP(*Channels.first, true); - RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); + RemoteObjectClientLayer<RPCEndpoint> Client(AcknowledgeORCv1Deprecation, + ClientEP, ReportError); RPCEndpoint ServerEP(*Channels.second, true); MockObjectLayer BaseLayer( @@ -144,9 +145,8 @@ TEST(RemoteObjectLayer, AddObject) { return 1; }); - RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server(BaseLayer, - ServerEP, - ReportError); + RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server( + AcknowledgeORCv1Deprecation, BaseLayer, ServerEP, ReportError); bool Finished = false; ServerEP.addHandler<remote::utils::TerminateSession>( @@ -181,7 +181,8 @@ TEST(RemoteObjectLayer, AddObjectFailure) { }; RPCEndpoint ClientEP(*Channels.first, true); - RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); + RemoteObjectClientLayer<RPCEndpoint> Client(AcknowledgeORCv1Deprecation, + ClientEP, ReportError); RPCEndpoint ServerEP(*Channels.second, true); MockObjectLayer BaseLayer( @@ -191,9 +192,8 @@ TEST(RemoteObjectLayer, AddObjectFailure) { return make_error<StringError>("AddObjectFailure - Test Message", inconvertibleErrorCode()); }); - RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server(BaseLayer, - ServerEP, - ReportError); + RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server( + AcknowledgeORCv1Deprecation, BaseLayer, ServerEP, ReportError); bool Finished = false; ServerEP.addHandler<remote::utils::TerminateSession>( @@ -233,7 +233,8 @@ TEST(RemoteObjectLayer, RemoveObject) { }; RPCEndpoint ClientEP(*Channels.first, true); - RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); + RemoteObjectClientLayer<RPCEndpoint> Client(AcknowledgeORCv1Deprecation, + ClientEP, ReportError); RPCEndpoint ServerEP(*Channels.second, true); @@ -243,9 +244,8 @@ TEST(RemoteObjectLayer, RemoveObject) { SymTab[1] = MockObjectLayer::LookupFn(); return 1; }); - RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server(BaseLayer, - ServerEP, - ReportError); + RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server( + AcknowledgeORCv1Deprecation, BaseLayer, ServerEP, ReportError); bool Finished = false; ServerEP.addHandler<remote::utils::TerminateSession>( @@ -283,7 +283,8 @@ TEST(RemoteObjectLayer, RemoveObjectFailure) { }; RPCEndpoint ClientEP(*Channels.first, true); - RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); + RemoteObjectClientLayer<RPCEndpoint> Client(AcknowledgeORCv1Deprecation, + ClientEP, ReportError); RPCEndpoint ServerEP(*Channels.second, true); @@ -294,9 +295,8 @@ TEST(RemoteObjectLayer, RemoveObjectFailure) { MockObjectLayer::SymbolLookupTable &SymTab) { return 42; }); - RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server(BaseLayer, - ServerEP, - ReportError); + RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server( + AcknowledgeORCv1Deprecation, BaseLayer, ServerEP, ReportError); bool Finished = false; ServerEP.addHandler<remote::utils::TerminateSession>( @@ -339,7 +339,8 @@ TEST(RemoteObjectLayer, FindSymbol) { }; RPCEndpoint ClientEP(*Channels.first, true); - RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); + RemoteObjectClientLayer<RPCEndpoint> Client(AcknowledgeORCv1Deprecation, + ClientEP, ReportError); RPCEndpoint ServerEP(*Channels.second, true); @@ -358,9 +359,8 @@ TEST(RemoteObjectLayer, FindSymbol) { }; return 42; }); - RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server(BaseLayer, - ServerEP, - ReportError); + RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server( + AcknowledgeORCv1Deprecation, BaseLayer, ServerEP, ReportError); bool Finished = false; ServerEP.addHandler<remote::utils::TerminateSession>( @@ -421,7 +421,8 @@ TEST(RemoteObjectLayer, FindSymbolIn) { }; RPCEndpoint ClientEP(*Channels.first, true); - RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); + RemoteObjectClientLayer<RPCEndpoint> Client(AcknowledgeORCv1Deprecation, + ClientEP, ReportError); RPCEndpoint ServerEP(*Channels.second, true); @@ -447,9 +448,8 @@ TEST(RemoteObjectLayer, FindSymbolIn) { return 42; }); - RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server(BaseLayer, - ServerEP, - ReportError); + RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server( + AcknowledgeORCv1Deprecation, BaseLayer, ServerEP, ReportError); bool Finished = false; ServerEP.addHandler<remote::utils::TerminateSession>( @@ -496,7 +496,8 @@ TEST(RemoteObjectLayer, EmitAndFinalize) { }; RPCEndpoint ClientEP(*Channels.first, true); - RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); + RemoteObjectClientLayer<RPCEndpoint> Client(AcknowledgeORCv1Deprecation, + ClientEP, ReportError); RPCEndpoint ServerEP(*Channels.second, true); @@ -506,9 +507,8 @@ TEST(RemoteObjectLayer, EmitAndFinalize) { SymTab[1] = MockObjectLayer::LookupFn(); return 1; }); - RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server(BaseLayer, - ServerEP, - ReportError); + RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server( + AcknowledgeORCv1Deprecation, BaseLayer, ServerEP, ReportError); bool Finished = false; ServerEP.addHandler<remote::utils::TerminateSession>( @@ -547,7 +547,8 @@ TEST(RemoteObjectLayer, EmitAndFinalizeFailure) { }; RPCEndpoint ClientEP(*Channels.first, true); - RemoteObjectClientLayer<RPCEndpoint> Client(ClientEP, ReportError); + RemoteObjectClientLayer<RPCEndpoint> Client(AcknowledgeORCv1Deprecation, + ClientEP, ReportError); RPCEndpoint ServerEP(*Channels.second, true); @@ -556,9 +557,8 @@ TEST(RemoteObjectLayer, EmitAndFinalizeFailure) { MockObjectLayer::SymbolLookupTable &SymTab) { return 1; }); - RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server(BaseLayer, - ServerEP, - ReportError); + RemoteObjectServerLayer<MockObjectLayer, RPCEndpoint> Server( + AcknowledgeORCv1Deprecation, BaseLayer, ServerEP, ReportError); bool Finished = false; ServerEP.addHandler<remote::utils::TerminateSession>( |
