Skip to content

Commit 5ac7226

Browse files
committed
[NFC] OSSACanonicalizeOwned: Renamed found defs.
The field is no longer a worklist, just a list of discovered defs.
1 parent 29d8d20 commit 5ac7226

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ class CanonicalizeOSSALifetime final {
342342
};
343343
friend llvm::DenseMapInfo<Def>;
344344

345-
/// Visited set for general def-use traversal that prevents revisiting values.
346-
SmallVector<Def, 8> defUseWorklist;
345+
/// The defs derived from currentDef whose uses are added to liveness.
346+
SmallVector<Def, 8> discoveredDefs;
347347

348348
/// The blocks that were discovered by PrunedLiveness.
349349
SmallVector<SILBasicBlock *, 32> discoveredBlocks;

lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ bool CanonicalizeOSSALifetime::computeCanonicalLiveness() {
137137
auto addDefToWorklist = [&](Def def) {
138138
if (!visitedDefs.insert(def.getValue()))
139139
return;
140-
defUseWorklist.push_back(def);
141-
indexWorklist.push_back(defUseWorklist.size() - 1);
140+
discoveredDefs.push_back(def);
141+
indexWorklist.push_back(discoveredDefs.size() - 1);
142142
};
143-
defUseWorklist.clear();
143+
discoveredDefs.clear();
144144
addDefToWorklist(Def::root(getCurrentDef()));
145145
// Only the first level of reborrows need to be consider. All nested inner
146146
// adjacent reborrows and phis are encapsulated within their lifetimes.
@@ -153,7 +153,7 @@ bool CanonicalizeOSSALifetime::computeCanonicalLiveness() {
153153
}
154154
while (!indexWorklist.empty()) {
155155
auto index = indexWorklist.pop_back_val();
156-
auto def = defUseWorklist[index];
156+
auto def = discoveredDefs[index];
157157
auto value = def.getValue();
158158
LLVM_DEBUG(llvm::dbgs() << " Uses of value:\n";
159159
value->print(llvm::dbgs()));
@@ -1160,16 +1160,16 @@ void CanonicalizeOSSALifetime::rewriteCopies(
11601160
SmallVectorImpl<DestroyValueInst *> const &newDestroys) {
11611161
assert(getCurrentDef()->getOwnershipKind() == OwnershipKind::Owned);
11621162

1163-
// Shadow defUseWorklist in order to constrain its uses.
1164-
auto &defUseWorklist = this->defUseWorklist;
1163+
// Shadow discoveredDefs in order to constrain its uses.
1164+
auto &discoveredDefs = this->discoveredDefs;
11651165

11661166
SmallVector<unsigned, 8> indexWorklist;
11671167
ValueSet visitedDefs(getCurrentDef()->getFunction());
11681168
auto addDefToWorklist = [&](Def def) {
11691169
if (!visitedDefs.insert(def.getValue()))
11701170
return;
1171-
defUseWorklist.push_back(def);
1172-
indexWorklist.push_back(defUseWorklist.size() - 1);
1171+
discoveredDefs.push_back(def);
1172+
indexWorklist.push_back(discoveredDefs.size() - 1);
11731173
};
11741174

11751175
InstructionSetVector instsToDelete(getCurrentDef()->getFunction());
@@ -1217,13 +1217,13 @@ void CanonicalizeOSSALifetime::rewriteCopies(
12171217
return true;
12181218
};
12191219

1220-
defUseWorklist.clear();
1220+
discoveredDefs.clear();
12211221
addDefToWorklist(Def::root(getCurrentDef()));
12221222
// Perform a def-use traversal, visiting each use operand.
12231223

12241224
while (!indexWorklist.empty()) {
12251225
auto index = indexWorklist.pop_back_val();
1226-
auto def = defUseWorklist[index];
1226+
auto def = discoveredDefs[index];
12271227
switch (def) {
12281228
case Def::Kind::BorrowedFrom:
12291229
case Def::Kind::Reborrow:

0 commit comments

Comments
 (0)