@@ -156,7 +156,7 @@ class VisitBarrierAccessScopes {
156156 // whose successors are in the region) blocks in the region only the top
157157 // of which was already visited. Either way, the instructions between the
158158 // local gen and its kill have not yet been visited. Visit them now.
159- auto foundLocalKill = visitBlockFromGenUntilBegin (instruction);
159+ auto foundLocalKill = visitBlockFromGenThroughKill (instruction);
160160 assert (foundLocalKill && " local gen without local kill?!" );
161161 (void )foundLocalKill;
162162 }
@@ -165,13 +165,14 @@ class VisitBarrierAccessScopes {
165165private:
166166 // / Entry points for visiting: they visit increasingly large portions of a
167167 // / block.
168- // / - visitBlockFromGenUntilBegin: Instructions and phi until a kill.
168+ // / - visitBlockFromGenThroughKill: Instructions and phi through the first
169+ // / kill.
169170 // / - visitBlockFromGen: Instructions, phi, and begin.
170171 // / - visitBlock: End, instructions, phi, and begin.
171172
172173 // / Visit instructions and phis starting from the specified gen until a kill
173174 // / is found.
174- bool visitBlockFromGenUntilBegin (SILInstruction *from) {
175+ bool visitBlockFromGenThroughKill (SILInstruction *from) {
175176 assert (effects.effectForInstruction (from) == Effects::Effect::Gen ());
176177 for (auto *instruction = from; instruction;
177178 instruction = instruction->getPreviousInstruction ()) {
@@ -198,7 +199,7 @@ class VisitBarrierAccessScopes {
198199 [&](SILBasicBlock *successor) { return visited.contains (successor); }));
199200
200201 visited.insert (block);
201- bool foundLocalKill = visitBlockFromGenUntilBegin (from);
202+ bool foundLocalKill = visitBlockFromGenThroughKill (from);
202203 assert (!foundLocalKill && " found local kill for non-local gen?!" );
203204 (void )foundLocalKill;
204205 visitBlockBegin (block);
0 commit comments