replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ORC] Make sure we linker-mangle symbol names in the SpeculationLayer. 

If mangling is not performed then speculative lookups will fail.

llvm-svn: 369219
This commit is contained in:
Lang Hames 2019-08-18 21:29:57 +00:00
parent a264b6074a
commit cf276ba82e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/examples/SpeculativeJIT/SpeculativeJIT.cpp
View File

@ -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(

13
llvm/include/llvm/ExecutionEngine/Orc/Speculation.h
View File

@ -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;