diff options
Diffstat (limited to 'llvm/examples')
4 files changed, 26 insertions, 23 deletions
diff --git a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter3/KaleidoscopeJIT.h b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter3/KaleidoscopeJIT.h index 717fbb7d995..35104f926d4 100644 --- a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter3/KaleidoscopeJIT.h +++ b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter3/KaleidoscopeJIT.h @@ -64,28 +64,30 @@ private: public: KaleidoscopeJIT() : TM(EngineBuilder().selectTarget()), DL(TM->createDataLayout()), - ObjectLayer(ES, + ObjectLayer(AcknowledgeORCv1Deprecation, ES, [this](VModuleKey K) { return LegacyRTDyldObjectLinkingLayer::Resources{ std::make_shared<SectionMemoryManager>(), Resolvers[K]}; }), - CompileLayer(ObjectLayer, SimpleCompiler(*TM)), - OptimizeLayer(CompileLayer, + CompileLayer(AcknowledgeORCv1Deprecation, ObjectLayer, + SimpleCompiler(*TM)), + OptimizeLayer(AcknowledgeORCv1Deprecation, CompileLayer, [this](std::unique_ptr<Module> M) { return optimizeModule(std::move(M)); }), CompileCallbackManager(cantFail(orc::createLocalCompileCallbackManager( TM->getTargetTriple(), ES, 0))), - CODLayer(ES, OptimizeLayer, - [&](orc::VModuleKey K) { return Resolvers[K]; }, - [&](orc::VModuleKey K, std::shared_ptr<SymbolResolver> R) { - Resolvers[K] = std::move(R); - }, - [](Function &F) { return std::set<Function *>({&F}); }, - *CompileCallbackManager, - orc::createLocalIndirectStubsManagerBuilder( - TM->getTargetTriple())) { + CODLayer( + AcknowledgeORCv1Deprecation, ES, OptimizeLayer, + [&](orc::VModuleKey K) { return Resolvers[K]; }, + [&](orc::VModuleKey K, std::shared_ptr<SymbolResolver> R) { + Resolvers[K] = std::move(R); + }, + [](Function &F) { return std::set<Function *>({&F}); }, + *CompileCallbackManager, + orc::createLocalIndirectStubsManagerBuilder( + TM->getTargetTriple())) { llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr); } diff --git a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter4/KaleidoscopeJIT.h b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter4/KaleidoscopeJIT.h index 3cf521ce2be..ee5225672fc 100644 --- a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter4/KaleidoscopeJIT.h +++ b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter4/KaleidoscopeJIT.h @@ -105,13 +105,14 @@ public: }, [](Error Err) { cantFail(std::move(Err), "lookupFlags failed"); })), TM(EngineBuilder().selectTarget()), DL(TM->createDataLayout()), - ObjectLayer(ES, + ObjectLayer(AcknowledgeORCv1Deprecation, ES, [this](VModuleKey K) { return LegacyRTDyldObjectLinkingLayer::Resources{ std::make_shared<SectionMemoryManager>(), Resolver}; }), - CompileLayer(ObjectLayer, SimpleCompiler(*TM)), - OptimizeLayer(CompileLayer, + CompileLayer(AcknowledgeORCv1Deprecation, ObjectLayer, + SimpleCompiler(*TM)), + OptimizeLayer(AcknowledgeORCv1Deprecation, CompileLayer, [this](std::unique_ptr<Module> M) { return optimizeModule(std::move(M)); }), diff --git a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter5/KaleidoscopeJIT.h b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter5/KaleidoscopeJIT.h index d6c9d12c538..5cc64da68cc 100644 --- a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter5/KaleidoscopeJIT.h +++ b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter5/KaleidoscopeJIT.h @@ -113,14 +113,15 @@ public: TM(EngineBuilder().selectTarget(Triple(Remote.getTargetTriple()), "", "", SmallVector<std::string, 0>())), DL(TM->createDataLayout()), - ObjectLayer(ES, + ObjectLayer(AcknowledgeORCv1Deprecation, ES, [this](VModuleKey K) { return LegacyRTDyldObjectLinkingLayer::Resources{ cantFail(this->Remote.createRemoteMemoryManager()), Resolver}; }), - CompileLayer(ObjectLayer, SimpleCompiler(*TM)), - OptimizeLayer(CompileLayer, + CompileLayer(AcknowledgeORCv1Deprecation, ObjectLayer, + SimpleCompiler(*TM)), + OptimizeLayer(AcknowledgeORCv1Deprecation, CompileLayer, [this](std::unique_ptr<Module> M) { return optimizeModule(std::move(M)); }), diff --git a/llvm/examples/Kaleidoscope/include/KaleidoscopeJIT.h b/llvm/examples/Kaleidoscope/include/KaleidoscopeJIT.h index 162dcfed989..a253a973a4c 100644 --- a/llvm/examples/Kaleidoscope/include/KaleidoscopeJIT.h +++ b/llvm/examples/Kaleidoscope/include/KaleidoscopeJIT.h @@ -45,17 +45,16 @@ public: KaleidoscopeJIT() : Resolver(createLegacyLookupResolver( ES, - [this](const std::string &Name) { - return findMangledSymbol(Name); - }, + [this](const std::string &Name) { return findMangledSymbol(Name); }, [](Error Err) { cantFail(std::move(Err), "lookupFlags failed"); })), TM(EngineBuilder().selectTarget()), DL(TM->createDataLayout()), - ObjectLayer(ES, + ObjectLayer(AcknowledgeORCv1Deprecation, ES, [this](VModuleKey) { return ObjLayerT::Resources{ std::make_shared<SectionMemoryManager>(), Resolver}; }), - CompileLayer(ObjectLayer, SimpleCompiler(*TM)) { + CompileLayer(AcknowledgeORCv1Deprecation, ObjectLayer, + SimpleCompiler(*TM)) { llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr); } |
