Merge pull request #83119 from DougGregor/unsafe-covers-unsafe-6.2

Author: DougGregor

lib/Sema/TypeCheckEffects.cpp

@@ -3816,7 +3816,6 @@ class CheckEffectsCoverage : public EffectsHandlingWalker<CheckEffectsCoverage>
     }
 
     void preserveCoverageFromUnsafeOperand() {
-      OldFlags.mergeFrom(ContextFlags::HasAnyUnsafeSite, Self.Flags);
       OldFlags.mergeFrom(ContextFlags::HasAnyUnsafe, Self.Flags);
       OldFlags.mergeFrom(ContextFlags::asyncAwaitFlags(), Self.Flags);
       OldFlags.mergeFrom(ContextFlags::throwFlags(), Self.Flags);

test/Unsafe/safe.swift

@@ -374,3 +374,10 @@ func testInterpolation(ptr: UnsafePointer<Int>) {
   // expected-note@-1{{reference to unsafe type 'UnsafePointer<Int>'}}
   // expected-note@-2{{argument #0 in call to instance method 'appendInterpolation' has unsafe type 'UnsafePointer<Int>'}}
 }
+
+func superDuperUnsafe(_ bytes: UnsafeRawBufferPointer) {
+  // expected-warning@+1{{no unsafe operations occur within 'unsafe' expression}}
+  let byte = unsafe unsafe bytes.first ?? 0
+  _ = byte
+  _ = unsafe bytes.first ?? 0
+}

test/Unsafe/unsafe_nonstrict.swift

@@ -16,3 +16,10 @@ func testItAll(ut: UnsafeType, x: X, i: Int) {
   unsafe acceptP(x)
   _ = unsafe i // expected-warning{{no unsafe operations occur within 'unsafe' expression}}
 }
+
+func superDuperUnsafe(_ bytes: UnsafeRawBufferPointer) {
+  // expected-warning@+1{{no unsafe operations occur within 'unsafe' expression}}
+  let byte = unsafe unsafe bytes.first ?? 0
+  _ = byte
+  _ = unsafe bytes.first ?? 0
+}