@@ -207,7 +207,7 @@ class PartitionOpTranslator {
207
207
SILFunction *function;
208
208
ProtocolDecl *sendableProtocol;
209
209
210
- llvm::Optional <TrackableValue> trackIfNonSendable (SILValue value) const {
210
+ std::optional <TrackableValue> trackIfNonSendable (SILValue value) const {
211
211
auto state = getTrackableValue (value);
212
212
if (state.isNonSendable ()) {
213
213
return state;
@@ -1077,7 +1077,7 @@ enum class LocalConsumedReasonKind {
1077
1077
// kind == NonLocal: an instruction outside this block
1078
1078
struct LocalConsumedReason {
1079
1079
LocalConsumedReasonKind kind;
1080
- llvm::Optional <PartitionOp> localInst;
1080
+ std::optional <PartitionOp> localInst;
1081
1081
1082
1082
static LocalConsumedReason ConsumeInst (PartitionOp localInst) {
1083
1083
assert (localInst.getKind () == PartitionOpKind::Consume);
@@ -1097,7 +1097,7 @@ struct LocalConsumedReason {
1097
1097
1098
1098
private:
1099
1099
LocalConsumedReason (LocalConsumedReasonKind kind,
1100
- llvm::Optional <PartitionOp> localInst = {})
1100
+ std::optional <PartitionOp> localInst = {})
1101
1101
: kind(kind), localInst(localInst) {}
1102
1102
};
1103
1103
@@ -1259,7 +1259,7 @@ class RaceTracer {
1259
1259
void findAndAddConsumedReasons (
1260
1260
SILBasicBlock * SILBlock, TrackableValueID consumedVal,
1261
1261
ConsumedReason &consumedReason, unsigned distance,
1262
- llvm::Optional <PartitionOp> targetOp = {}) {
1262
+ std::optional <PartitionOp> targetOp = {}) {
1263
1263
assert (blockStates[SILBlock].getExitPartition ().isConsumed (consumedVal));
1264
1264
LocalConsumedReason localReason
1265
1265
= findLocalConsumedReason (SILBlock, consumedVal, targetOp);
@@ -1361,7 +1361,7 @@ class RaceTracer {
1361
1361
// consumed, possibly local or nonlocal. Return the reason.
1362
1362
LocalConsumedReason findLocalConsumedReason (
1363
1363
SILBasicBlock * SILBlock, TrackableValueID consumedVal,
1364
- llvm::Optional <PartitionOp> targetOp = {}) {
1364
+ std::optional <PartitionOp> targetOp = {}) {
1365
1365
// if this is a query for consumption reason at block exit, check the cache
1366
1366
if (!targetOp && consumedAtExitReasons.count ({SILBlock, consumedVal}))
1367
1367
return consumedAtExitReasons.at ({SILBlock, consumedVal});
@@ -1372,7 +1372,7 @@ class RaceTracer {
1372
1372
// so assert that it's actually consumed at exit
1373
1373
assert (targetOp || block.getExitPartition ().isConsumed (consumedVal));
1374
1374
1375
- llvm::Optional <LocalConsumedReason> consumedReason;
1375
+ std::optional <LocalConsumedReason> consumedReason;
1376
1376
1377
1377
Partition workingPartition = block.getEntryPartition ();
1378
1378
0 commit comments