Skip to content

Commit 9c16318

Browse files
committed
[NFC] LifetimeCompletion: Simplified enum wrapper.
1 parent f1539f1 commit 9c16318

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

lib/SIL/Utils/OSSALifetimeCompletion.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class VisitUnreachableLifetimeEnds {
149149
llvm::function_ref<void(SILInstruction *)> visit);
150150

151151
struct State {
152-
enum class Value : uint8_t {
152+
enum Value : uint8_t {
153153
Unavailable = 0,
154154
Available,
155155
Unknown,
@@ -161,10 +161,6 @@ class VisitUnreachableLifetimeEnds {
161161
State meet(State const other) const {
162162
return *this < other ? *this : other;
163163
}
164-
165-
static State Unavailable() { return {Value::Unavailable}; }
166-
static State Available() { return {Value::Available}; }
167-
static State Unknown() { return {Value::Unknown}; }
168164
};
169165

170166
struct Result {
@@ -244,9 +240,9 @@ void VisitUnreachableLifetimeEnds::propagateAvailablity(Result &result) {
244240
// - start blocks are ::Available
245241
for (auto *block : region) {
246242
if (starts.contains(block))
247-
result.setState(block, State::Available());
243+
result.setState(block, State::Available);
248244
else
249-
result.setState(block, State::Unknown());
245+
result.setState(block, State::Unknown);
250246
}
251247

252248
BasicBlockWorklist worklist(value->getFunction());
@@ -280,14 +276,14 @@ void VisitUnreachableLifetimeEnds::propagateAvailablity(Result &result) {
280276
void VisitUnreachableLifetimeEnds::visitAvailabilityBoundary(
281277
Result const &result, llvm::function_ref<void(SILInstruction *)> visit) {
282278
for (auto *block : region) {
283-
auto available = result.getState(block) == State::Available();
279+
auto available = result.getState(block) == State::Available;
284280
if (!available) {
285281
continue;
286282
}
287283
auto hasUnreachableSuccessor = [&]() {
288284
// Use a lambda to avoid checking if possible.
289285
return llvm::any_of(block->getSuccessorBlocks(), [&result](auto *block) {
290-
return result.getState(block) == State::Unavailable();
286+
return result.getState(block) == State::Unavailable;
291287
});
292288
};
293289
if (!block->succ_empty() && !hasUnreachableSuccessor()) {

0 commit comments

Comments
 (0)