Skip to content

Commit 9385d36

Browse files
committed
[NFC] LifetimeCompletion: Rename helper fn.
It visits the availability boundary, so call it `visitAvailabilityBoundary`. It's not clear what "unreachable lifetime ends" are.
1 parent b195321 commit 9385d36

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

include/swift/SIL/OSSALifetimeCompletion.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ class OSSALifetimeCompletion {
120120
DoNotAllowLeaks = false,
121121
};
122122

123-
static void visitUnreachableLifetimeEnds(
124-
SILValue value, AllowLeaks_t allowLeaks,
125-
const SSAPrunedLiveness &liveness,
126-
llvm::function_ref<void(SILInstruction *)> visit);
123+
static void
124+
visitAvailabilityBoundary(SILValue value, AllowLeaks_t allowLeaks,
125+
const SSAPrunedLiveness &liveness,
126+
llvm::function_ref<void(SILInstruction *)> visit);
127127

128128
protected:
129129
bool analyzeAndUpdateLifetime(SILValue value, Boundary boundary);

lib/SIL/Utils/OSSALifetimeCompletion.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static bool endLifetimeAtLivenessBoundary(SILValue value,
105105
}
106106

107107
namespace {
108-
/// Implements OSSALifetimeCompletion::visitUnreachableLifetimeEnds. Finds
108+
/// Implements OSSALifetimeCompletion::visitAvailabilityBoundary. Finds
109109
/// positions as near as possible to unreachables at which `value`'s lifetime
110110
/// is available.
111111
///
@@ -118,7 +118,7 @@ namespace {
118118
/// the value is available--these are the blocks
119119
/// without successors or with at least one
120120
/// unavailable successor.
121-
class VisitUnreachableLifetimeEnds {
121+
class AvailabilityBoundaryVisitor {
122122
/// The value whose dead-end block lifetime ends are to be visited.
123123
SILValue value;
124124

@@ -134,8 +134,8 @@ class VisitUnreachableLifetimeEnds {
134134
BasicBlockSetVector region;
135135

136136
public:
137-
VisitUnreachableLifetimeEnds(SILValue value,
138-
OSSALifetimeCompletion::AllowLeaks_t allowLeaks)
137+
AvailabilityBoundaryVisitor(SILValue value,
138+
OSSALifetimeCompletion::AllowLeaks_t allowLeaks)
139139
: value(value), allowLeaks(allowLeaks), starts(value->getFunction()),
140140
region(value->getFunction()) {}
141141

@@ -198,7 +198,7 @@ class VisitUnreachableLifetimeEnds {
198198
};
199199
};
200200

201-
void VisitUnreachableLifetimeEnds::computeRegion(
201+
void AvailabilityBoundaryVisitor::computeRegion(
202202
const SSAPrunedLiveness &liveness) {
203203
// (1) Compute the complete liveness boundary.
204204
PrunedLivenessBoundary boundary;
@@ -258,7 +258,7 @@ void VisitUnreachableLifetimeEnds::computeRegion(
258258
}
259259
}
260260

261-
void VisitUnreachableLifetimeEnds::propagateAvailablity(Result &result) {
261+
void AvailabilityBoundaryVisitor::propagateAvailablity(Result &result) {
262262
// Initialize per-block state.
263263
// - all blocks outside of the region are ::Unavailable (automatically
264264
// initialized)
@@ -299,7 +299,7 @@ void VisitUnreachableLifetimeEnds::propagateAvailablity(Result &result) {
299299
}
300300
}
301301

302-
void VisitUnreachableLifetimeEnds::visitAvailabilityBoundary(
302+
void AvailabilityBoundaryVisitor::visitAvailabilityBoundary(
303303
Result const &result, llvm::function_ref<void(SILInstruction *)> visit) {
304304
for (auto *block : region) {
305305
auto available = result.getState(block) == State::Available;
@@ -328,15 +328,15 @@ void VisitUnreachableLifetimeEnds::visitAvailabilityBoundary(
328328
}
329329
} // end anonymous namespace
330330

331-
void OSSALifetimeCompletion::visitUnreachableLifetimeEnds(
331+
void OSSALifetimeCompletion::visitAvailabilityBoundary(
332332
SILValue value, AllowLeaks_t allowLeaks, const SSAPrunedLiveness &liveness,
333333
llvm::function_ref<void(SILInstruction *)> visit) {
334334

335-
VisitUnreachableLifetimeEnds visitor(value, allowLeaks);
335+
AvailabilityBoundaryVisitor visitor(value, allowLeaks);
336336

337337
visitor.computeRegion(liveness);
338338

339-
VisitUnreachableLifetimeEnds::Result result(value->getFunction());
339+
AvailabilityBoundaryVisitor::Result result(value->getFunction());
340340

341341
visitor.propagateAvailablity(result);
342342

@@ -347,7 +347,7 @@ static bool endLifetimeAtAvailabilityBoundary(
347347
SILValue value, OSSALifetimeCompletion::AllowLeaks_t allowLeaks,
348348
const SSAPrunedLiveness &liveness) {
349349
bool changed = false;
350-
OSSALifetimeCompletion::visitUnreachableLifetimeEnds(
350+
OSSALifetimeCompletion::visitAvailabilityBoundary(
351351
value, allowLeaks, liveness, [&](auto *unreachable) {
352352
SILBuilderWithScope builder(unreachable);
353353
endOSSALifetime(value, builder);

lib/SILOptimizer/Utils/CanonicalizeOSSALifetime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ void CanonicalizeOSSALifetime::extendLivenessToDeinitBarriers() {
273273
completeLiveness.updateForUse(end, /*lifetimeEnding*/ true);
274274
}
275275

276-
OSSALifetimeCompletion::visitUnreachableLifetimeEnds(
276+
OSSALifetimeCompletion::visitAvailabilityBoundary(
277277
getCurrentDef(), OSSALifetimeCompletion::DoNotAllowLeaks,
278278
completeLiveness, [&](auto *unreachable) {
279279
recordUnreachableLifetimeEnd(unreachable);

0 commit comments

Comments
 (0)