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

[gardening] Standardize SILBasicBlock successor/predecessor methods that deal with blocks rather than the full successor data structure to have the suffix 'Block'.

Browse Source 
This was already done for getSuccessorBlocks() to distinguish getting successor
blocks from getting the full list of SILSuccessors via getSuccessors(). This
commit just makes all of the successor/predecessor code follow that naming
convention.

Some examples:

getSingleSuccessor() => getSingleSuccessorBlock().
isSuccessor() => isSuccessorBlock().
getPreds() => getPredecessorBlocks().

Really, IMO, we should consider renaming SILSuccessor to a more verbose name so
that it is clear that it is more of an internal detail of SILBasicBlock's
implementation rather than something that one should consider as apart of one's
mental model of the IR when one really wants to be thinking about predecessor
and successor blocks. But that is not what this commit is trying to change, it
is just trying to eliminate a bit of technical debt by making the naming
conventions here consistent.
This commit is contained in:
Michael Gottesman
2016-11-27 11:25:33 -08:00
parent 32000742df
commit 38ec08f45f
43 changed files with 195 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp
View File

@@ -1458,7 +1458,7 @@ void LifetimeChecker::handleLoadUseFailure(const DIMemoryUse &Use,
// Otherwise, there are multiple paths to the epilog block, scan its
// predecessors to see if there are any where the value is unavailable.
// If so, we can use its location information for more precision.
for (auto pred : LI->getParent()->getPreds()) {
for (auto pred : LI->getParent()->getPredecessorBlocks()) {
auto *TI = pred->getTerminator();
// Check if this is an early return with uninitialized members.
if (TI->getLoc().getKind() == SILLocation::ReturnKind &&
@@ -2335,13 +2335,13 @@ computePredsLiveOut(SILBasicBlock *BB) {
// Collect blocks for which we have to calculate the out-availability.
// These are the paths from blocks with known out-availability to the BB.
WorkListType WorkList;
for (auto Pred : BB->getPreds()) {
for (auto Pred : BB->getPredecessorBlocks()) {
putIntoWorkList(Pred, WorkList);
}
size_t idx = 0;
while (idx < WorkList.size()) {
SILBasicBlock *WorkBB = WorkList[idx++];
for (auto Pred : WorkBB->getPreds()) {
for (auto Pred : WorkBB->getPredecessorBlocks()) {
putIntoWorkList(Pred, WorkList);
}
}
@@ -2365,7 +2365,7 @@ computePredsLiveOut(SILBasicBlock *BB) {
LiveOutBlockState &BBState = getBlockInfo(WorkBB);
// Merge from the predecessor blocks.
for (auto Pred : WorkBB->getPreds()) {
for (auto Pred : WorkBB->getPredecessorBlocks()) {
changed |= BBState.mergeFromPred(getBlockInfo(Pred));
}
DEBUG(llvm::dbgs() << " Block " << WorkBB->getDebugID() << " out: "
@@ -2382,8 +2382,8 @@ computePredsLiveOut(SILBasicBlock *BB) {
void LifetimeChecker::
getOutAvailability(SILBasicBlock *BB, AvailabilitySet &Result) {
computePredsLiveOut(BB);
for (auto Pred : BB->getPreds()) {
for (auto *Pred : BB->getPredecessorBlocks()) {
// If self was consumed in a predecessor P, don't look at availability
// at all, because there's no point in making things more conditional
// than they are. If we enter the current block through P, the self value
@@ -2401,8 +2401,8 @@ getOutAvailability(SILBasicBlock *BB, AvailabilitySet &Result) {
void LifetimeChecker::
getOutSelfConsumed(SILBasicBlock *BB, Optional<DIKind> &Result) {
computePredsLiveOut(BB);
for (auto Pred : BB->getPreds())
for (auto *Pred : BB->getPredecessorBlocks())
Result = mergeKinds(Result, getBlockInfo(Pred).OutSelfConsumed);
}