@@ -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