Skip to content

Commit ffa9119

Browse files
nate-chandlergottesmm
authored andcommitted
[CanonicalizeOSSALifetime] Renamed member.
The member just clears the values. After it adopted BitfieldRef, the call to invalidate on the liveness instance was already superfluous. (cherry picked from commit 3c4275a)
1 parent 439a719 commit ffa9119

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

include/swift/SILOptimizer/Utils/CanonicalizeOSSALifetime.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,9 @@ class CanonicalizeOSSALifetime final {
319319
liveness->initializeDef(getCurrentDef());
320320
}
321321

322-
void invalidateLiveness() {
322+
void clear() {
323323
consumingBlocks.clear();
324324
debugValues.clear();
325-
liveness->invalidate();
326325
discoveredBlocks.clear();
327326
}
328327

lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ bool CanonicalizeOSSALifetime::computeLiveness() {
10421042
// Step 1: compute liveness
10431043
if (!computeCanonicalLiveness()) {
10441044
LLVM_DEBUG(llvm::errs() << "Failed to compute canonical liveness?!\n");
1045-
invalidateLiveness();
1045+
clear();
10461046
return false;
10471047
}
10481048
if (accessBlockAnalysis) {
@@ -1076,7 +1076,7 @@ void CanonicalizeOSSALifetime::rewriteLifetimes() {
10761076
// Step 6: rewrite copies and delete extra destroys
10771077
rewriteCopies();
10781078

1079-
invalidateLiveness();
1079+
clear();
10801080
consumes.clear();
10811081
}
10821082

0 commit comments

Comments
 (0)