Skip to content

Commit acd1063

Browse files
committed
[send-non-sendable] Convert some llvm::Optional -> std::optional.
1 parent 969477a commit acd1063

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/SILOptimizer/Mandatory/SendNonSendable.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class PartitionOpTranslator {
207207
SILFunction *function;
208208
ProtocolDecl *sendableProtocol;
209209

210-
llvm::Optional<TrackableValue> trackIfNonSendable(SILValue value) const {
210+
std::optional<TrackableValue> trackIfNonSendable(SILValue value) const {
211211
auto state = getTrackableValue(value);
212212
if (state.isNonSendable()) {
213213
return state;
@@ -1077,7 +1077,7 @@ enum class LocalConsumedReasonKind {
10771077
// kind == NonLocal: an instruction outside this block
10781078
struct LocalConsumedReason {
10791079
LocalConsumedReasonKind kind;
1080-
llvm::Optional<PartitionOp> localInst;
1080+
std::optional<PartitionOp> localInst;
10811081

10821082
static LocalConsumedReason ConsumeInst(PartitionOp localInst) {
10831083
assert(localInst.getKind() == PartitionOpKind::Consume);
@@ -1097,7 +1097,7 @@ struct LocalConsumedReason {
10971097

10981098
private:
10991099
LocalConsumedReason(LocalConsumedReasonKind kind,
1100-
llvm::Optional<PartitionOp> localInst = {})
1100+
std::optional<PartitionOp> localInst = {})
11011101
: kind(kind), localInst(localInst) {}
11021102
};
11031103

@@ -1259,7 +1259,7 @@ class RaceTracer {
12591259
void findAndAddConsumedReasons(
12601260
SILBasicBlock * SILBlock, TrackableValueID consumedVal,
12611261
ConsumedReason &consumedReason, unsigned distance,
1262-
llvm::Optional<PartitionOp> targetOp = {}) {
1262+
std::optional<PartitionOp> targetOp = {}) {
12631263
assert(blockStates[SILBlock].getExitPartition().isConsumed(consumedVal));
12641264
LocalConsumedReason localReason
12651265
= findLocalConsumedReason(SILBlock, consumedVal, targetOp);
@@ -1361,7 +1361,7 @@ class RaceTracer {
13611361
// consumed, possibly local or nonlocal. Return the reason.
13621362
LocalConsumedReason findLocalConsumedReason(
13631363
SILBasicBlock * SILBlock, TrackableValueID consumedVal,
1364-
llvm::Optional<PartitionOp> targetOp = {}) {
1364+
std::optional<PartitionOp> targetOp = {}) {
13651365
// if this is a query for consumption reason at block exit, check the cache
13661366
if (!targetOp && consumedAtExitReasons.count({SILBlock, consumedVal}))
13671367
return consumedAtExitReasons.at({SILBlock, consumedVal});
@@ -1372,7 +1372,7 @@ class RaceTracer {
13721372
// so assert that it's actually consumed at exit
13731373
assert(targetOp || block.getExitPartition().isConsumed(consumedVal));
13741374

1375-
llvm::Optional<LocalConsumedReason> consumedReason;
1375+
std::optional<LocalConsumedReason> consumedReason;
13761376

13771377
Partition workingPartition = block.getEntryPartition();
13781378

0 commit comments

Comments
 (0)