From 98e55477558a823b1045b54d5a09681a3c0b819a Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Tue, 21 Jan 2020 20:35:40 -0800 Subject: [PATCH] [ORC] Update examples to incorporate changes in ce2207abaf9. This should fix the builders that were failing due to broken JIT examples after ce2207abaf9. --- llvm/examples/Kaleidoscope/BuildingAJIT/Chapter1/KaleidoscopeJIT.h | 3 ++- llvm/examples/Kaleidoscope/BuildingAJIT/Chapter2/KaleidoscopeJIT.h | 3 ++- llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter1/KaleidoscopeJIT.h b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter1/KaleidoscopeJIT.h index 020b72c2394..b7404baf1ff 100644 --- a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter1/KaleidoscopeJIT.h +++ b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter1/KaleidoscopeJIT.h @@ -45,7 +45,8 @@ public: KaleidoscopeJIT(JITTargetMachineBuilder JTMB, DataLayout DL) : ObjectLayer(ES, []() { return std::make_unique(); }), - CompileLayer(ES, ObjectLayer, ConcurrentIRCompiler(std::move(JTMB))), + CompileLayer(ES, ObjectLayer, + std::make_unique(std::move(JTMB))), DL(std::move(DL)), Mangle(ES, this->DL), Ctx(std::make_unique()), MainJD(ES.createJITDylib("
")) { diff --git a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter2/KaleidoscopeJIT.h b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter2/KaleidoscopeJIT.h index c8f01c04cf5..efb19349e3e 100644 --- a/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter2/KaleidoscopeJIT.h +++ b/llvm/examples/Kaleidoscope/BuildingAJIT/Chapter2/KaleidoscopeJIT.h @@ -51,7 +51,8 @@ public: KaleidoscopeJIT(JITTargetMachineBuilder JTMB, DataLayout DL) : ObjectLayer(ES, []() { return std::make_unique(); }), - CompileLayer(ES, ObjectLayer, ConcurrentIRCompiler(std::move(JTMB))), + CompileLayer(ES, ObjectLayer, + std::make_unique(std::move(JTMB))), OptimizeLayer(ES, CompileLayer, optimizeModule), DL(std::move(DL)), Mangle(ES, this->DL), Ctx(std::make_unique()), MainJD(ES.createJITDylib("
")) { diff --git a/llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp b/llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp index f4cfb7403db..3828e0a5f82 100644 --- a/llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp +++ b/llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp @@ -104,7 +104,7 @@ private: : ES(std::move(ES)), DL(std::move(DL)), MainJD(this->ES->createJITDylib("
")), LCTMgr(std::move(LCTMgr)), CompileLayer(*this->ES, ObjLayer, - ConcurrentIRCompiler(std::move(JTMB))), + std::make_unique(std::move(JTMB))), S(Imps, *this->ES), SpeculateLayer(*this->ES, CompileLayer, S, Mangle, BlockFreqQuery()), CODLayer(*this->ES, SpeculateLayer, *this->LCTMgr, -- 2.11.0