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

SILOptimizer: use the BasicBlockFlag utility in ReachableBlocks

Browse Source
This commit is contained in:
Erik Eckstein
2021-01-21 08:56:50 +01:00
parent 65976fd0c5
commit 763bfed6a4
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/SILOptimizer/Utils/BasicBlockOptUtils.cpp
View File

@@ -19,13 +19,10 @@ using namespace swift;
/// Invoke \p visitor for each reachable block in \p f in worklist order (at
/// least one predecessor has been visited).
bool ReachableBlocks::visit(SILFunction *f,
function_ref<bool(SILBasicBlock *)> visitor) {
assert(visited.empty() && "blocks already visited");
bool ReachableBlocks::visit(function_ref<bool(SILBasicBlock *)> visitor) {
// Walk over the CFG, starting at the entry block, until all reachable blocks
// are visited.
SILBasicBlock *entryBB = f->getEntryBlock();
SILBasicBlock *entryBB = visited.getFunction()->getEntryBlock();
SmallVector<SILBasicBlock *, 8> worklist = {entryBB};
visited.insert(entryBB);
while (!worklist.empty()) {
@@ -34,7 +31,7 @@ bool ReachableBlocks::visit(SILFunction *f,
return false;
for (auto &succ : bb->getSuccessors()) {
if (visited.insert(succ).second)
if (visited.insert(succ))
worklist.push_back(succ);
}
}
@@ -71,9 +68,9 @@ void swift::removeDeadBlock(SILBasicBlock *bb) {
}
bool swift::removeUnreachableBlocks(SILFunction &f) {
ReachableBlocks reachable;
ReachableBlocks reachable(&f);
// Visit all the blocks without doing any extra work.
reachable.visit(&f, [](SILBasicBlock *) { return true; });
reachable.visit([](SILBasicBlock *) { return true; });
// Remove the blocks we never reached. Assume the entry block is visited.
// Reachable's visited set contains dangling pointers during this loop.