Skip to content

Commit a0ebd87

Browse files
committed
Remove unused tracking of unsafe uses in the effects checker
We track this information via anchor, so we don't need to manage a separate list that doesn't have an anchor.
1 parent 2fc9ac0 commit a0ebd87

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

lib/Sema/TypeCheckEffects.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3112,9 +3112,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
31123112
/// context.
31133113
ConditionalEffectKind MaxThrowingKind;
31143114

3115-
/// All of the unsafe uses within the current context.
3116-
SmallVector<UnsafeUse, 2> UnsafeUses;
3117-
31183115
struct DiagnosticInfo {
31193116
DiagnosticInfo(Expr &failingExpr,
31203117
PotentialEffectReason reason,
@@ -3192,7 +3189,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
31923189
ContextFlags OldFlags;
31933190
ConditionalEffectKind OldMaxThrowingKind;
31943191
SourceLoc OldAwaitLoc;
3195-
SmallVector<UnsafeUse, 2> OldUnsafeUses;
31963192
SourceLoc OldUnsafeLoc;
31973193

31983194
public:
@@ -3201,7 +3197,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
32013197
OldRethrowsDC(self.RethrowsDC), OldReasyncDC(self.ReasyncDC),
32023198
OldFlags(self.Flags), OldMaxThrowingKind(self.MaxThrowingKind),
32033199
OldAwaitLoc(self.CurContext.awaitLoc),
3204-
OldUnsafeUses(self.UnsafeUses),
32053200
OldUnsafeLoc(self.CurContext.unsafeLoc) {
32063201
if (newContext) self.CurContext = *newContext;
32073202
}
@@ -3244,7 +3239,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
32443239
void resetCoverage() {
32453240
Self.Flags.reset();
32463241
Self.MaxThrowingKind = ConditionalEffectKind::None;
3247-
Self.UnsafeUses.clear();
32483242
}
32493243

32503244
void resetCoverageForAutoclosureBody() {
@@ -3304,7 +3298,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
33043298
OldMaxThrowingKind = std::max(OldMaxThrowingKind, Self.MaxThrowingKind);
33053299

33063300
OldFlags.mergeFrom(ContextFlags::HasAnyUnsafeSite, Self.Flags);
3307-
mergeUnsafeUses(OldUnsafeUses, Self.UnsafeUses);
33083301
}
33093302

33103303
void preserveCoverageFromNonExhaustiveCatch() {
@@ -3327,7 +3320,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
33273320
OldFlags.mergeFrom(ContextFlags::throwFlags(), Self.Flags);
33283321
OldFlags.mergeFrom(ContextFlags::unsafeFlags(), Self.Flags);
33293322
OldMaxThrowingKind = std::max(OldMaxThrowingKind, Self.MaxThrowingKind);
3330-
mergeUnsafeUses(OldUnsafeUses, Self.UnsafeUses);
33313323

33323324
preserveDiagnoseErrorOnTryFlag();
33333325
}
@@ -3347,13 +3339,11 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
33473339
OldFlags.mergeFrom(ContextFlags::asyncAwaitFlags(), Self.Flags);
33483340
OldFlags.mergeFrom(ContextFlags::unsafeFlags(), Self.Flags);
33493341
OldMaxThrowingKind = std::max(OldMaxThrowingKind, Self.MaxThrowingKind);
3350-
mergeUnsafeUses(OldUnsafeUses, Self.UnsafeUses);
33513342
}
33523343

33533344
void preserveCoverageFromOptionalOrForcedTryOperand() {
33543345
OldFlags.mergeFrom(ContextFlags::asyncAwaitFlags(), Self.Flags);
33553346
OldFlags.mergeFrom(ContextFlags::unsafeFlags(), Self.Flags);
3356-
mergeUnsafeUses(OldUnsafeUses, Self.UnsafeUses);
33573347
}
33583348

33593349
void preserveCoverageFromInterpolatedString() {
@@ -3364,7 +3354,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
33643354
OldFlags.mergeFrom(ContextFlags::HasAnyUnsafeSite, Self.Flags);
33653355
OldFlags.mergeFrom(ContextFlags::HasAnyUnsafe, Self.Flags);
33663356
OldMaxThrowingKind = std::max(OldMaxThrowingKind, Self.MaxThrowingKind);
3367-
mergeUnsafeUses(OldUnsafeUses, Self.UnsafeUses);
33683357

33693358
preserveDiagnoseErrorOnTryFlag();
33703359
}
@@ -3379,15 +3368,9 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
33793368
Self.ReasyncDC = OldReasyncDC;
33803369
Self.Flags = OldFlags;
33813370
Self.MaxThrowingKind = OldMaxThrowingKind;
3382-
Self.UnsafeUses = OldUnsafeUses;
33833371
Self.CurContext.awaitLoc = OldAwaitLoc;
33843372
Self.CurContext.unsafeLoc = OldUnsafeLoc;
33853373
}
3386-
3387-
static void mergeUnsafeUses(SmallVectorImpl<UnsafeUse> &intoUses,
3388-
ArrayRef<UnsafeUse> fromUses) {
3389-
intoUses.insert(intoUses.end(), fromUses.begin(), fromUses.end());
3390-
}
33913374
};
33923375

33933376
/// Retrieve the type of the error that can be caught when an error is

0 commit comments

Comments
 (0)