[region-isolation] Clean up the named value transfer warning.

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -971,7 +971,7 @@ NOTE(regionbasedisolation_isolated_since_in_same_region_basename, none,
 //
 
 ERROR(regionbasedisolation_named_transfer_yields_race, none,
-      "transferring non-Sendable value %0 could yield races with later accesses",
+      "transferring %0 could cause a race",
       (Identifier))
 NOTE(regionbasedisolation_named_info_transfer_yields_race, none,
      "%0 is transferred from %1 caller to %2 callee. Later uses in caller could race with potential uses in callee",

test/Concurrency/experimental_feature_strictconcurrency.swift

@@ -31,7 +31,7 @@ func iterate(stream: AsyncStream<Int>) async {
   // FIXME: Region isolation should consider a value from a 'nonisolated(unsafe)'
   // declaration to be in a disconnected region
 
-  // expected-region-isolation-warning @+3 {{transferring non-Sendable value 'it' could yield races with later accesses}}
+  // expected-region-isolation-warning @+3 {{transferring 'it' could cause a race}}
   // expected-region-isolation-note @+2 {{'it' is transferred from main actor-isolated caller to nonisolated callee. Later uses in caller could race with potential uses in callee}}
   // expected-region-isolation-note @+1 {{access here could race}}
   while let element = await it.next() {

test/Concurrency/sendable_checking.swift

@@ -273,7 +273,7 @@ func testNonSendableBaseArg() async {
   let t = NonSendable() // expected-tns-note {{variable defined here}}
   await t.update()
   // expected-targeted-and-complete-warning @-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
-  // expected-tns-warning @-2 {{transferring non-Sendable value 't' could yield races with later accesses}}
+  // expected-tns-warning @-2 {{transferring 't' could cause a race}}
   // expected-tns-note @-3 {{'t' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
 
   _ = await t.x

test/Concurrency/transfernonsendable.swift

@@ -104,7 +104,7 @@ private struct StructContainingValue { // expected-complete-note 2{{}}
   var x = StructContainingValue() // expected-tns-note {{variable defined here}}
   x = StructContainingValue()
 
-  await transferToNonIsolated(x) // expected-tns-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToNonIsolated(x) // expected-tns-warning {{transferring 'x' could cause a race}}
   // expected-tns-note @-1 {{'x' is transferred from global actor 'GlobalActor'-isolated caller to nonisolated callee. Later uses in caller could race with potential uses in callee}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'StructContainingValue' outside of global actor 'GlobalActor'-isolated context may introduce data races}}
 

test/Concurrency/transfernonsendable_global_actor.swift

@@ -353,7 +353,7 @@ func test_indirect_regions(a : A, b : Bool) async {
     }
 
     if (b) {
-        await a.foo(ns5_0) // expected-tns-warning {{transferring non-Sendable value 'ns5_0' could yield races with later accesses}}
+        await a.foo(ns5_0) // expected-tns-warning {{transferring 'ns5_0' could cause a race}}
         // expected-tns-note @-1 {{'ns5_0' is transferred from nonisolated caller to actor-isolated callee. Later uses in caller could race with potential uses in callee}}
         // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any' into actor-isolated context may introduce data races}}
 
@@ -363,7 +363,7 @@ func test_indirect_regions(a : A, b : Bool) async {
           print(ns5_1) // expected-tns-note {{access here could race}}
         }
     } else {
-        await a.foo(ns5_1) // expected-tns-warning {{transferring non-Sendable value 'ns5_1' could yield races with later accesses}}
+        await a.foo(ns5_1) // expected-tns-warning {{transferring 'ns5_1' could cause a race}}
         // expected-tns-note @-1 {{'ns5_1' is transferred from nonisolated caller to actor-isolated callee. Later uses in caller could race with potential uses in callee}}
         // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any' into actor-isolated context may introduce data races}}
 

test/Concurrency/transfernonsendable_region_based_sendability.swift

@@ -93,14 +93,14 @@ func testTransferringParameter_canTransfer(_ x: transferring Klass, _ y: Klass)
 
 func testTransferringParameter_cannotTransferTwice(_ x: transferring Klass, _ y: Klass) async {
   // expected-note @-1:54 {{variable defined here}}
-  await transferToMain(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToMain(x) // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
   await transferToMain(x) // expected-note {{access here could race}}
 }
 
 func testTransferringParameter_cannotUseAfterTransfer(_ x: transferring Klass, _ y: Klass) async {
   // expected-note @-1 {{variable defined here}}
-  await transferToMain(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToMain(x) // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
   useValue(x) // expected-note {{access here could race}}
 }
@@ -116,14 +116,14 @@ actor MyActor {
 
   func getNormalErrorIfTransferTwice(_ x: transferring Klass) async {
     // expected-note @-1 {{variable defined here}}
-    await transferToMain(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+    await transferToMain(x) // expected-warning {{transferring 'x' could cause a race}}
     // expected-note @-1 {{'x' is transferred from actor-isolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
     await transferToMain(x) // expected-note {{access here could race}}
   }
 
   func getNormalErrorIfUseAfterTransfer(_ x: transferring Klass) async {
     // expected-note @-1 {{variable defined here}}
-    await transferToMain(x)  // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+    await transferToMain(x)  // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from actor-isolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
     useValue(x) // expected-note {{access here could race}}
   }
@@ -163,7 +163,7 @@ func canTransferAssigningIntoLocal(_ x: transferring Klass) async {
 func canTransferAssigningIntoLocal2(_ x: transferring Klass) async {
   // expected-note @-1 {{variable defined here}}
   let _ = x
-  await transferToMain(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToMain(x) // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
   let _ = x // expected-note {{access here could race}}
 }
@@ -226,7 +226,7 @@ func canTransferAfterAssignButUseIsError(_ x: transferring Any) async {
   x = y
 
   // TODO: This should refer to the transferring parameter.
-  await transferToMain(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToMain(x) // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
 
   useValue(x) // expected-note {{access here could race}}
@@ -256,7 +256,7 @@ func mergeDoesNotEliminateEarlierTransfer(_ x: transferring NonSendableStruct) a
   useValue(x)
 
   // Transfer x
-  await transferToMain(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToMain(x) // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
 
   // y is assigned into a field of x, so we treat this like a merge.
@@ -274,7 +274,7 @@ func mergeDoesNotEliminateEarlierTransfer2(_ x: transferring NonSendableStruct)
   useValue(x)
 
   // Transfer x
-  await transferToMain(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToMain(x) // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
 
   // y is assigned into a field of x, so we treat this like a merge.

test/Concurrency/transfernonsendable_strong_transferring_params.swift

@@ -68,7 +68,7 @@ func simpleTest() async {
 func simpleTest2() async {
   let x = NonSendableKlass() // expected-note {{variable defined here}}
   let y = transferResultWithArg(x)
-  await transferToMainDirect(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToMainDirect(x) // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
   useValue(y)
   useValue(x) // expected-note {{access here could race}}
@@ -79,14 +79,14 @@ func simpleTest3() async {
   let x = NonSendableKlass()
   let y = transferResultWithArg(x) // expected-note {{variable defined here}}
   await transferToMainDirect(x)
-  await transferToMainDirect(y) // expected-warning {{transferring non-Sendable value 'y' could yield races with later accesses}}
+  await transferToMainDirect(y) // expected-warning {{transferring 'y' could cause a race}}
   // expected-note @-1 {{'y' is transferred from nonisolated caller to main actor-isolated callee}}
   useValue(y) // expected-note {{access here could race}}
 }
 
 func transferResult() async -> transferring NonSendableKlass {
   let x = NonSendableKlass() // expected-note {{variable defined here}}
-  await transferToMainDirect(x) // expected-warning {{transferring non-Sendable value 'x' could yield races with later accesses}}
+  await transferToMainDirect(x) // expected-warning {{transferring 'x' could cause a race}}
   // expected-note @-1 {{'x' is transferred from nonisolated caller to main actor-isolated callee. Later uses in caller could race with potential uses in callee}}
   return x // expected-note {{access here could race}}
 }