Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

lib/AST/ASTWalker.cpp

@@ -1461,6 +1461,10 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
   }
 
   Expr *visitTypeValueExpr(TypeValueExpr *E) {
+    if (auto *TR = E->getRepr()) {
+      if (doIt(TR))
+        return nullptr;
+    }
     return E;
   }
 

lib/Sema/TypeCheckEffects.cpp

@@ -3851,7 +3851,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/Index/index_generic_params.swift

@@ -165,3 +165,16 @@ _ = C.Nested(value: 1)
 // CHECK-NEXT: [[@LINE+2]]:7 | struct/Swift | Nested | [[C_Nested_USR]] | Ref | rel: 0
 // CHECK-NEXT: [[@LINE+1]]:14 | constructor/Swift | init(value:) | [[C_Nested_init_USR]] | Ref,Call | rel: 0
 _ = C.Nested.init(value: 1)
+
+// MARK: - Test value generic parameters
+
+struct HasValueGenericParam<let Param: Int> {
+// CHECK:      [[@LINE-1]]:33 | type-alias/generic-type-param/Swift | Param | s:14swift_ide_test20HasValueGenericParamV0G0xmfp | Def,RelChild | rel: 1
+// CHECK-NEXT:   RelChild | struct/Swift | HasValueGenericParam
+  func foo() {
+    _ = Param
+    // CHECK:      [[@LINE-1]]:9 | type-alias/generic-type-param/Swift | Param | s:14swift_ide_test20HasValueGenericParamV0G0xmfp | Ref,RelCont | rel: 1
+    // CHECK-NEXT:   RelCont | instance-method/Swift | foo()
+  }
+}
+

test/SourceKit/CursorInfo/cursor_generics.swift

@@ -34,6 +34,12 @@ public protocol Proto<Assoc> {
   associatedtype Assoc
 }
 
+struct HasValueGenericParam<let Param: Int> {
+  func foo() {
+    _ = Param
+  }
+}
+
 // RUN: %sourcekitd-test -req=cursor -pos=1:10 %s -- %s | %FileCheck -check-prefix=CHECK1 %s
 // CHECK1: <Declaration>func testGenerics&lt;T&gt;(x: <Type usr="s:15cursor_generics12testGenerics1xyx_tlF1TL_xmfp">T</Type>)</Declaration>
 
@@ -69,3 +75,7 @@ public protocol Proto<Assoc> {
 // CHECK_ASSOC_COMMON-NEXT: source.refactoring.kind.rename.global
 // CHECK_ASSOC_COMMON-NEXT: Global Rename
 // CHECK_ASSOC_COMMON-NEXT: ACTIONS END
+
+// RUN: %sourcekitd-test -req=cursor -pos=39:9 %s -- %s | %FileCheck -check-prefix=CHECK_VALUE_GENERIC %s
+// CHECK_VALUE_GENERIC: source.lang.swift.ref.generic_type_param (37:33-37:38)
+// CHECK_VALUE_GENERIC: <Declaration>let Param : <Type usr="s:Si">Int</Type></Declaration>

test/Unsafe/safe.swift

@@ -384,3 +384,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
+}