[send-non-sendable] Convert a few tests of sendable behavior to check for both strict and strict + sns behavior using the new diagnostic verifier multiple prefix option.

Author: gottesmm

test/Concurrency/async_tasks.swift

@@ -1,4 +1,6 @@
-// RUN: %target-swift-frontend -strict-concurrency=targeted -disable-availability-checking %s -o /dev/null -verify
+// RUN: %target-swift-frontend -strict-concurrency=targeted -disable-availability-checking %s -o /dev/null -verify -emit-sil
+// RUN: %target-swift-frontend -strict-concurrency=strict -disable-availability-checking %s -o /dev/null -verify -emit-sil
+// RUN: %target-swift-frontend -strict-concurrency=strict -disable-availability-checking %s -o /dev/null -verify -emit-sil -enable-experimental-feature SendNonSendable
 
 // REQUIRES: concurrency
 

test/Concurrency/sendable_associated_type.swift

@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend -strict-concurrency=complete -emit-sil -o /dev/null %s -verify
+// RUN: %target-swift-frontend -strict-concurrency=complete -enable-experimental-feature SendNonSendable -emit-sil -o /dev/null %s -verify
 
 // REQUIRES: concurrency
 

test/Concurrency/sendable_checking.swift

@@ -1,19 +1,23 @@
-// RUN: %target-swift-frontend -verify -strict-concurrency=targeted -emit-sil -o /dev/null %s
+// RUN: %target-swift-frontend -verify -strict-concurrency=targeted -verify-additional-prefix targeted-and-complete- -emit-sil -o /dev/null %s
+// RUN: %target-swift-frontend -verify -strict-concurrency=complete -verify-additional-prefix targeted-and-complete- -verify-additional-prefix complete-and-sns- -verify-additional-prefix complete- -emit-sil -o /dev/null %s
+// RUN: %target-swift-frontend -verify -strict-concurrency=complete -verify-additional-prefix sns- -verify-additional-prefix complete-and-sns- -emit-sil -o /dev/null %s -enable-experimental-feature SendNonSendable 
 
 // REQUIRES: concurrency
 // REQUIRES: OS=macosx
 
 @available(SwiftStdlib 5.1, *)
 struct NS1 { }
-// expected-note@-1 2{{consider making struct 'NS1' conform to the 'Sendable' protocol}}
+// expected-note @-1 {{consider making struct 'NS1' conform to the 'Sendable' protocol}}
+// expected-targeted-and-complete-note @-2 {{consider making struct 'NS1' conform to the 'Sendable' protocol}}
 
 @available(SwiftStdlib 5.1, *)
 @available(*, unavailable)
 extension NS1: Sendable { }
 // expected-note@-1 4{{conformance of 'NS1' to 'Sendable' has been explicitly marked unavailable here}}
 
 @available(SwiftStdlib 5.1, *)
-struct NS2 { // expected-note{{consider making struct 'NS2' conform to the 'Sendable' protocol}}
+struct NS2 { // expected-note {{consider making struct 'NS2' conform to the 'Sendable' protocol}}
+  // expected-complete-and-sns-note @-1 {{consider making struct 'NS2' conform to the 'Sendable' protocol}}
   var ns1: NS1
 }
 
@@ -24,7 +28,8 @@ struct NS3 { }
 extension NS3: Sendable { }
 
 @available(SwiftStdlib 5.1, *)
-class NS4 { } // expected-note{{class 'NS4' does not conform to the 'Sendable' protocol}}
+class NS4 { } // expected-note {{class 'NS4' does not conform to the 'Sendable' protocol}}
+// expected-complete-and-sns-note @-1 {{class 'NS4' does not conform to the 'Sendable' protocol}}
 
 @available(SwiftStdlib 5.1, *)
 func acceptCV<T: Sendable>(_: T) { }
@@ -35,15 +40,22 @@ func acceptSendableFn(_: @Sendable @escaping () -> Void) { }
 func testCV(
   ns1: NS1, ns1array: [NS1], ns2: NS2, ns3: NS3, ns4: NS4,
   fn: @escaping () -> Void
-  // expected-note@-1{{parameter 'fn' is implicitly non-sendable}}
+  // expected-note @-1 {{parameter 'fn' is implicitly non-sendable}}
 ) {
-  acceptCV(ns1) // expected-warning{{conformance of 'NS1' to 'Sendable' is unavailable}}
-  acceptCV(ns1array) // expected-warning{{conformance of 'NS1' to 'Sendable' is unavailable}}
-  acceptCV(ns2)
-  acceptCV(ns3) // expected-warning{{conformance of 'NS3' to 'Sendable' is only available in macOS 11.0 or newer}}
-  // expected-note@-1{{add 'if #available' version check}}
-  acceptCV(ns4)
-  acceptCV(fn)
+  acceptCV(ns1) // expected-warning {{conformance of 'NS1' to 'Sendable' is unavailable}}
+
+  acceptCV(ns1array) // expected-warning {{conformance of 'NS1' to 'Sendable' is unavailable}}
+
+  acceptCV(ns2) // expected-complete-and-sns-warning {{type 'NS2' does not conform to the 'Sendable' protocol}}
+
+  acceptCV(ns3) // expected-warning {{conformance of 'NS3' to 'Sendable' is only available in macOS 11.0 or newer}}
+  // expected-note @-1 {{add 'if #available' version check}}
+
+  acceptCV(ns4) // expected-complete-and-sns-warning {{type 'NS4' does not conform to the 'Sendable' protocol}}
+
+  acceptCV(fn) // expected-complete-and-sns-warning {{type '() -> Void' does not conform to the 'Sendable' protocol}}
+  // expected-complete-and-sns-note @-1 {{a function type must be marked '@Sendable' to conform to 'Sendable'}}
+
   acceptSendableFn(fn) // expected-warning{{passing non-sendable parameter 'fn' to function expecting a @Sendable closure}}
 }
 
@@ -82,7 +94,7 @@ public actor MyActor: MyProto {
   public func bar<B>(aBar: B) async where B: Sendable { }
 
   func g(ns1: NS1) async {
-    await nonisolatedAsyncFunc1(ns1) // expected-warning{{passing argument of non-sendable type 'NS1' outside of actor-isolated context may introduce data races}}
+    await nonisolatedAsyncFunc1(ns1) // expected-targeted-and-complete-warning{{passing argument of non-sendable type 'NS1' outside of actor-isolated context may introduce data races}}
     _ = await nonisolatedAsyncFunc2() // expected-warning{{non-sendable type 'NS1' returned by implicitly asynchronous call to nonisolated function cannot cross actor boundary}}
   }
 }
@@ -234,7 +246,9 @@ func testConversionsAndSendable(a: MyActor, s: any Sendable, f: @Sendable () ->
 
 @available(SwiftStdlib 5.1, *)
 final class NonSendable {
-  // expected-note@-1 6 {{class 'NonSendable' does not conform to the 'Sendable' protocol}}
+  // expected-note @-1 3 {{class 'NonSendable' does not conform to the 'Sendable' protocol}}
+  // SendNonSendable emits 3 fewer errors here.
+  // expected-targeted-and-complete-note @-3 3 {{class 'NonSendable' does not conform to the 'Sendable' protocol}}
   var value = ""
 
   @MainActor
@@ -244,10 +258,10 @@ final class NonSendable {
 
   func call() async {
     await update()
-    // expected-warning@-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
+    // expected-targeted-and-complete-warning @-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
 
     await self.update()
-    // expected-warning@-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
+    // expected-targeted-and-complete-warning @-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
 
     _ = await x
     // expected-warning@-1 {{non-sendable type 'NonSendable' passed in implicitly asynchronous call to main actor-isolated property 'x' cannot cross actor boundary}}
@@ -264,8 +278,8 @@ final class NonSendable {
 func testNonSendableBaseArg() async {
   let t = NonSendable()
   await t.update()
-  // expected-warning@-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
+  // expected-targeted-and-complete-warning @-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
 
   _ = await t.x
-  // expected-warning@-1 {{non-sendable type 'NonSendable' passed in implicitly asynchronous call to main actor-isolated property 'x' cannot cross actor boundary}}
+  // expected-warning @-1 {{non-sendable type 'NonSendable' passed in implicitly asynchronous call to main actor-isolated property 'x' cannot cross actor boundary}}
 }

test/Concurrency/sendable_existentials.swift

@@ -1,4 +1,6 @@
 // RUN: %target-swift-frontend -strict-concurrency=targeted -emit-sil -o /dev/null %s -verify
+// RUN: %target-swift-frontend -strict-concurrency=complete -verify-additional-prefix complete-and-sns- -verify-additional-prefix complete- -emit-sil -o /dev/null %s -verify
+// RUN: %target-swift-frontend -strict-concurrency=complete -verify-additional-prefix complete-and-sns- -emit-sil -o /dev/null %s -verify
 
 // REQUIRES: concurrency
 // REQUIRES: OS=macosx
@@ -34,22 +36,22 @@ func testE(a: Any, aOpt: Any?) async {
 }
 
 func testESilently(a: Any, aOpt: Any?) {
-  send(a)
-  sendOpt(a)
-  sendOpt(aOpt)
+  send(a) // expected-complete-and-sns-warning {{'Any' does not conform to the 'Sendable' protocol}}
+  sendOpt(a) // expected-complete-and-sns-warning {{'Any' does not conform to the 'Sendable' protocol}}
+  sendOpt(aOpt) // expected-complete-and-sns-warning {{'Any' does not conform to the 'Sendable' protocol}}
 
-  let _: E = .something(a)
-  _ = E.something(a)
+  let _: E = .something(a) // expected-complete-and-sns-warning {{'Any' does not conform to the 'Sendable' protocol}}
+  _ = E.something(a) // expected-complete-and-sns-warning {{'Any' does not conform to the 'Sendable' protocol}}
 
   var sendable: Sendable
-  sendable = a
+  sendable = a // expected-complete-and-sns-warning {{'Any' does not conform to the 'Sendable' protocol}}
 
   var arrayOfSendable: [Sendable]
-  arrayOfSendable = [a, a]
+  arrayOfSendable = [a, a] // expected-complete-and-sns-warning 2{{'Any' does not conform to the 'Sendable' protocol}}
 
   func localFunc() { }
-  sendable = localFunc
-
+  sendable = localFunc // expected-complete-and-sns-warning {{'() -> ()' does not conform to the 'Sendable' protocol}}
+  // expected-complete-and-sns-note @-1 {{a function type must be marked '@Sendable' to conform to 'Sendable'}}
   _ = sendable
   _ = arrayOfSendable
 }

test/Concurrency/sendable_without_preconcurrency.swift

@@ -2,6 +2,8 @@
 // RUN: %target-swift-frontend -emit-module -emit-module-path %t/StrictModule.swiftmodule -module-name StrictModule -swift-version 6 %S/Inputs/StrictModule.swift
 // RUN: %target-swift-frontend -emit-module -emit-module-path %t/NonStrictModule.swiftmodule -module-name NonStrictModule %S/Inputs/NonStrictModule.swift
 // RUN: %target-swift-frontend -strict-concurrency=targeted -disable-availability-checking -I %t -verify %s -o /dev/null -emit-sil
+// RUN: %target-swift-frontend -strict-concurrency=complete -disable-availability-checking -I %t -verify %s -o /dev/null -emit-sil -verify-additional-prefix complete-
+// RUN: %target-swift-frontend -strict-concurrency=complete -disable-availability-checking -I %t -verify %s -o /dev/null -emit-sil -verify-additional-prefix complete- -enable-experimental-feature SendNonSendable
 
 // REQUIRES: concurrency
 // REQUIRES: asserts
@@ -15,7 +17,7 @@ actor A {
 
 class NS { } // expected-note{{class 'NS' does not conform to the 'Sendable' protocol}}
 
-struct MyType {
+struct MyType { // expected-complete-note {{consider making struct 'MyType' conform to the 'Sendable' protocol}}
   var nsc: NonStrictClass
 }
 
@@ -27,7 +29,8 @@ struct MyType2 { // expected-note{{consider making struct 'MyType2' conform to t
 func testA(ns: NS, mt: MyType, mt2: MyType2, sc: StrictClass, nsc: NonStrictClass) async {
   Task {
     print(ns) // expected-warning{{capture of 'ns' with non-sendable type 'NS' in a `@Sendable` closure}}
-    print(mt) // no warning: MyType is Sendable because we suppressed NonStrictClass's warning
+    print(mt) // no warning by default: MyType is Sendable because we suppressed NonStrictClass's warning
+    // expected-complete-warning @-1 {{capture of 'mt' with non-sendable type 'MyType' in a `@Sendable` closure}}
     print(mt2) // expected-warning{{capture of 'mt2' with non-sendable type 'MyType2' in a `@Sendable` closure}}
     print(sc) // expected-warning{{capture of 'sc' with non-sendable type 'StrictClass' in a `@Sendable` closure}}
   }

test/Concurrency/sendable_without_preconcurrency_2.swift

@@ -2,6 +2,8 @@
 // RUN: %target-swift-frontend -emit-module -emit-module-path %t/StrictModule.swiftmodule -module-name StrictModule -swift-version 6 %S/Inputs/StrictModule.swift
 // RUN: %target-swift-frontend -emit-module -emit-module-path %t/NonStrictModule.swiftmodule -module-name NonStrictModule %S/Inputs/NonStrictModule.swift
 // RUN: %target-swift-frontend -strict-concurrency=targeted -disable-availability-checking -I %t %s -verify -emit-sil -o /dev/null
+// RUN: %target-swift-frontend -strict-concurrency=complete -verify-additional-prefix complete- -disable-availability-checking -I %t %s -verify -emit-sil -o /dev/null
+// RUN: %target-swift-frontend -strict-concurrency=complete -verify-additional-prefix complete- -disable-availability-checking -I %t %s -verify -emit-sil -o /dev/null -enable-experimental-feature SendNonSendable
 
 // REQUIRES: concurrency
 // REQUIRES: asserts
@@ -15,7 +17,7 @@ actor A {
 
 class NS { } // expected-note 2{{class 'NS' does not conform to the 'Sendable' protocol}}
 
-struct MyType {
+struct MyType { // expected-complete-note {{consider making struct 'MyType' conform to the 'Sendable' protocol}}
   var nsc: NonStrictClass
 }
 
@@ -27,7 +29,8 @@ struct MyType2: Sendable {
 func testA(ns: NS, mt: MyType, mt2: MyType2, sc: StrictClass, nsc: NonStrictClass) async {
   Task {
     print(ns) // expected-warning{{capture of 'ns' with non-sendable type 'NS' in a `@Sendable` closure}}
-    print(mt) // no warning: MyType is Sendable because we suppressed NonStrictClass's warning
+    print(mt) // no warning with targeted: MyType is Sendable because we suppressed NonStrictClass's warning
+    // expected-complete-warning @-1 {{capture of 'mt' with non-sendable type 'MyType' in a `@Sendable` closure}}
     print(mt2)
     print(sc) // expected-warning {{capture of 'sc' with non-sendable type 'StrictClass' in a `@Sendable` closure}}
     print(nsc) // expected-warning {{capture of 'nsc' with non-sendable type 'NonStrictClass' in a `@Sendable` closure}}