averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

SIL Linker: Remove one of the two worklists

Browse Source 
The second worklist was immediately drained after visiting each

SIL instruction, so it didn't really avoid any recursion.
Simplify the control flow by immediately deserializing the
function and then adding it to the primary worklist.
This commit is contained in:
Slava Pestov
2018-04-11 20:11:25 -07:00
parent 6a01e2d354
commit 9b483371f4
1 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/SIL/Linker.cpp
View File

@@ -33,18 +33,37 @@ STATISTIC(NumFuncLinked, "Number of SIL functions linked");
//===----------------------------------------------------------------------===//
bool SILLinkerVisitor::addFunctionToWorklist(SILFunction *F) {
FunctionDeserializationWorklist.push_back(F);
return true;
assert(F->isExternalDeclaration());
DEBUG(llvm::dbgs() << "Imported function: "
<< F->getName() << "\n");
if (auto *NewFn = Loader->lookupSILFunction(F)) {
if (NewFn->isExternalDeclaration())
return false;
assert(NewFn == F && "This shouldn't happen");
NewFn->setBare(IsBare);
NewFn->verify();
Worklist.push_back(NewFn);
++NumFuncLinked;
return true;
}
return false;
}
/// Deserialize a function and add it to the worklist for processing.
bool SILLinkerVisitor::maybeAddFunctionToWorklist(SILFunction *F) {
// Don't need to do anything if the function already has a body.
if (!F->isExternalDeclaration())
return false;
if (isLinkAll() || hasSharedVisibility(F->getLinkage()))
return addFunctionToWorklist(F);
return true;
return false;
}
/// Process F, recursively deserializing any thing F may reference.
@@ -370,33 +389,7 @@ bool SILLinkerVisitor::process() {
for (auto &BB : *Fn) {
for (auto &I : BB) {
// Should we try linking?
if (visit(&I)) {
for (auto *F : FunctionDeserializationWorklist) {
DEBUG(llvm::dbgs() << "Imported function: "
<< F->getName() << "\n");
F->setBare(IsBare);
if (F->isExternalDeclaration()) {
if (auto *NewFn = Loader->lookupSILFunction(F)) {
if (NewFn->isExternalDeclaration())
continue;
NewFn->verify();
Worklist.push_back(NewFn);
Result = true;
++NumFuncLinked;
}
}
}
FunctionDeserializationWorklist.clear();
} else {
assert(FunctionDeserializationWorklist.empty() &&
"Worklist should "
"always be empty if visit does not return true.");
}
Result |= visit(&I);
}
}
}