@@ -3112,9 +3112,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3112
3112
// / context.
3113
3113
ConditionalEffectKind MaxThrowingKind;
3114
3114
3115
- // / All of the unsafe uses within the current context.
3116
- SmallVector<UnsafeUse, 2 > UnsafeUses;
3117
-
3118
3115
struct DiagnosticInfo {
3119
3116
DiagnosticInfo (Expr &failingExpr,
3120
3117
PotentialEffectReason reason,
@@ -3192,7 +3189,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3192
3189
ContextFlags OldFlags;
3193
3190
ConditionalEffectKind OldMaxThrowingKind;
3194
3191
SourceLoc OldAwaitLoc;
3195
- SmallVector<UnsafeUse, 2 > OldUnsafeUses;
3196
3192
SourceLoc OldUnsafeLoc;
3197
3193
3198
3194
public:
@@ -3201,7 +3197,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3201
3197
OldRethrowsDC (self.RethrowsDC), OldReasyncDC(self.ReasyncDC),
3202
3198
OldFlags(self.Flags), OldMaxThrowingKind(self.MaxThrowingKind),
3203
3199
OldAwaitLoc(self.CurContext.awaitLoc),
3204
- OldUnsafeUses(self.UnsafeUses),
3205
3200
OldUnsafeLoc(self.CurContext.unsafeLoc) {
3206
3201
if (newContext) self.CurContext = *newContext;
3207
3202
}
@@ -3244,7 +3239,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3244
3239
void resetCoverage () {
3245
3240
Self.Flags .reset ();
3246
3241
Self.MaxThrowingKind = ConditionalEffectKind::None;
3247
- Self.UnsafeUses .clear ();
3248
3242
}
3249
3243
3250
3244
void resetCoverageForAutoclosureBody () {
@@ -3304,7 +3298,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3304
3298
OldMaxThrowingKind = std::max (OldMaxThrowingKind, Self.MaxThrowingKind );
3305
3299
3306
3300
OldFlags.mergeFrom (ContextFlags::HasAnyUnsafeSite, Self.Flags );
3307
- mergeUnsafeUses (OldUnsafeUses, Self.UnsafeUses );
3308
3301
}
3309
3302
3310
3303
void preserveCoverageFromNonExhaustiveCatch () {
@@ -3327,7 +3320,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3327
3320
OldFlags.mergeFrom (ContextFlags::throwFlags (), Self.Flags );
3328
3321
OldFlags.mergeFrom (ContextFlags::unsafeFlags (), Self.Flags );
3329
3322
OldMaxThrowingKind = std::max (OldMaxThrowingKind, Self.MaxThrowingKind );
3330
- mergeUnsafeUses (OldUnsafeUses, Self.UnsafeUses );
3331
3323
3332
3324
preserveDiagnoseErrorOnTryFlag ();
3333
3325
}
@@ -3347,13 +3339,11 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3347
3339
OldFlags.mergeFrom (ContextFlags::asyncAwaitFlags (), Self.Flags );
3348
3340
OldFlags.mergeFrom (ContextFlags::unsafeFlags (), Self.Flags );
3349
3341
OldMaxThrowingKind = std::max (OldMaxThrowingKind, Self.MaxThrowingKind );
3350
- mergeUnsafeUses (OldUnsafeUses, Self.UnsafeUses );
3351
3342
}
3352
3343
3353
3344
void preserveCoverageFromOptionalOrForcedTryOperand () {
3354
3345
OldFlags.mergeFrom (ContextFlags::asyncAwaitFlags (), Self.Flags );
3355
3346
OldFlags.mergeFrom (ContextFlags::unsafeFlags (), Self.Flags );
3356
- mergeUnsafeUses (OldUnsafeUses, Self.UnsafeUses );
3357
3347
}
3358
3348
3359
3349
void preserveCoverageFromInterpolatedString () {
@@ -3364,7 +3354,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3364
3354
OldFlags.mergeFrom (ContextFlags::HasAnyUnsafeSite, Self.Flags );
3365
3355
OldFlags.mergeFrom (ContextFlags::HasAnyUnsafe, Self.Flags );
3366
3356
OldMaxThrowingKind = std::max (OldMaxThrowingKind, Self.MaxThrowingKind );
3367
- mergeUnsafeUses (OldUnsafeUses, Self.UnsafeUses );
3368
3357
3369
3358
preserveDiagnoseErrorOnTryFlag ();
3370
3359
}
@@ -3379,15 +3368,9 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
3379
3368
Self.ReasyncDC = OldReasyncDC;
3380
3369
Self.Flags = OldFlags;
3381
3370
Self.MaxThrowingKind = OldMaxThrowingKind;
3382
- Self.UnsafeUses = OldUnsafeUses;
3383
3371
Self.CurContext .awaitLoc = OldAwaitLoc;
3384
3372
Self.CurContext .unsafeLoc = OldUnsafeLoc;
3385
3373
}
3386
-
3387
- static void mergeUnsafeUses (SmallVectorImpl<UnsafeUse> &intoUses,
3388
- ArrayRef<UnsafeUse> fromUses) {
3389
- intoUses.insert (intoUses.end (), fromUses.begin (), fromUses.end ());
3390
- }
3391
3374
};
3392
3375
3393
3376
// / Retrieve the type of the error that can be caught when an error is
0 commit comments