@@ -156,7 +156,7 @@ class VisitBarrierAccessScopes {
156
156
// whose successors are in the region) blocks in the region only the top
157
157
// of which was already visited. Either way, the instructions between the
158
158
// local gen and its kill have not yet been visited. Visit them now.
159
- auto foundLocalKill = visitBlockFromGenUntilBegin (instruction);
159
+ auto foundLocalKill = visitBlockFromGenThroughKill (instruction);
160
160
assert (foundLocalKill && " local gen without local kill?!" );
161
161
(void )foundLocalKill;
162
162
}
@@ -165,13 +165,14 @@ class VisitBarrierAccessScopes {
165
165
private:
166
166
// / Entry points for visiting: they visit increasingly large portions of a
167
167
// / block.
168
- // / - visitBlockFromGenUntilBegin: Instructions and phi until a kill.
168
+ // / - visitBlockFromGenThroughKill: Instructions and phi through the first
169
+ // / kill.
169
170
// / - visitBlockFromGen: Instructions, phi, and begin.
170
171
// / - visitBlock: End, instructions, phi, and begin.
171
172
172
173
// / Visit instructions and phis starting from the specified gen until a kill
173
174
// / is found.
174
- bool visitBlockFromGenUntilBegin (SILInstruction *from) {
175
+ bool visitBlockFromGenThroughKill (SILInstruction *from) {
175
176
assert (effects.effectForInstruction (from) == Effects::Effect::Gen ());
176
177
for (auto *instruction = from; instruction;
177
178
instruction = instruction->getPreviousInstruction ()) {
@@ -198,7 +199,7 @@ class VisitBarrierAccessScopes {
198
199
[&](SILBasicBlock *successor) { return visited.contains (successor); }));
199
200
200
201
visited.insert (block);
201
- bool foundLocalKill = visitBlockFromGenUntilBegin (from);
202
+ bool foundLocalKill = visitBlockFromGenThroughKill (from);
202
203
assert (!foundLocalKill && " found local kill for non-local gen?!" );
203
204
(void )foundLocalKill;
204
205
visitBlockBegin (block);
0 commit comments