diff options
| -rw-r--r-- | llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp | 2 | ||||
| -rw-r--r-- | llvm/include/llvm/ExecutionEngine/Orc/Speculation.h | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp b/llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp index 803badb59d9..bb075bd56b5 100644 --- a/llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp +++ b/llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp @@ -105,7 +105,7 @@ private: CompileLayer(*this->ES, ObjLayer, ConcurrentIRCompiler(std::move(JTMB))), S(Imps, *this->ES), - SpeculateLayer(*this->ES, CompileLayer, S, BlockFreqQuery()), + SpeculateLayer(*this->ES, CompileLayer, S, Mangle, BlockFreqQuery()), CODLayer(*this->ES, SpeculateLayer, *this->LCTMgr, std::move(ISMBuilder)) { this->ES->getMainJITDylib().addGenerator( diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Speculation.h b/llvm/include/llvm/ExecutionEngine/Orc/Speculation.h index 1899b60f076..bf24b587218 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/Speculation.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/Speculation.h @@ -157,8 +157,10 @@ public: using TargetAndLikelies = DenseMap<SymbolStringPtr, SymbolNameSet>; IRSpeculationLayer(ExecutionSession &ES, IRCompileLayer &BaseLayer, - Speculator &Spec, ResultEval Interpreter) - : IRLayer(ES), NextLayer(BaseLayer), S(Spec), QueryAnalysis(Interpreter) { + Speculator &Spec, MangleAndInterner &Mangle, + ResultEval Interpreter) + : IRLayer(ES), NextLayer(BaseLayer), S(Spec), Mangle(Mangle), + QueryAnalysis(Interpreter) { PB.registerFunctionAnalyses(FAM); } @@ -170,19 +172,18 @@ private: assert(!IRNames.empty() && "No IRNames received to Intern?"); TargetAndLikelies InternedNames; DenseSet<SymbolStringPtr> TargetJITNames; - ExecutionSession &Es = getExecutionSession(); for (auto &NamePair : IRNames) { for (auto &TargetNames : NamePair.second) - TargetJITNames.insert(Es.intern(TargetNames)); + TargetJITNames.insert(Mangle(TargetNames)); - InternedNames.insert( - {Es.intern(NamePair.first), std::move(TargetJITNames)}); + InternedNames[Mangle(NamePair.first)] = std::move(TargetJITNames); } return InternedNames; } IRCompileLayer &NextLayer; Speculator &S; + MangleAndInterner &Mangle; PassBuilder PB; FunctionAnalysisManager FAM; ResultEval QueryAnalysis; |
