Merge pull request #73471 from gottesmm/pr-f33bb59b938e7dde6c15c1831bcd9afcc7c31654

[region-isolation] Some more diagnostic wordsmithing.

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -943,7 +943,7 @@ NOTE(sil_referencebinding_inout_binding_here, none,
 //===----------------------------------------------------------------------===//
 
 NOTE(regionbasedisolation_maybe_race, none,
-     "potential concurrent access", ())
+     "access can happen concurrently", ())
 ERROR(regionbasedisolation_unknown_pattern, none,
       "pattern that the region based isolation checker does not understand how to check. Please file a bug",
       ())

test/ClangImporter/transferring.swift

@@ -29,12 +29,12 @@ func funcTestTransferringResult() async {
   let y2 = returnUserDefinedFromGlobalFunction(x2)
   await transferToMain(x2) // expected-error {{sending 'x2' risks causing data races}}
   // expected-note @-1 {{sending 'x2' to main actor-isolated global function 'transferToMain' risks causing data races between main actor-isolated and local nonisolated uses}}
-  useValue(y2) // expected-note {{potential concurrent access}}
+  useValue(y2) // expected-note {{access can happen concurrently}}
 }
 
 func funcTestTransferringArg() async {
   let x = NonSendableCStruct()
   transferUserDefinedIntoGlobalFunction(x) // expected-error {{sending 'x' risks causing data races}}
   // expected-note @-1 {{'x' used after being passed as a transferring parameter}}
-  useValue(x) // expected-note {{potential concurrent access}}
+  useValue(x) // expected-note {{access can happen concurrently}}
 }

test/ClangImporter/transferring_objc.swift

@@ -27,7 +27,7 @@ func methodTestTransferringArg() async {
   let s = NSObject()
   let _ = x.getResultWithTransferringArgument(s)  // expected-error {{sending 's' risks causing data races}}
   // expected-note @-1 {{'s' used after being passed as a transferring parameter; Later uses could race}}
-  useValue(s) // expected-note {{potential concurrent access}}
+  useValue(s) // expected-note {{access can happen concurrently}}
 }
 
 // Make sure we just ignore the swift_attr if it is applied to something like a
@@ -47,12 +47,12 @@ func funcTestTransferringResult() async {
   let y2 = returnNSObjectFromGlobalFunction(x2)
   await transferToMain(x2) // expected-error {{sending 'x2' risks causing data races}}
   // expected-note @-1 {{sending 'x2' to main actor-isolated global function 'transferToMain' risks causing data races between main actor-isolated and local nonisolated uses}}
-  useValue(y2) // expected-note {{potential concurrent access}}
+  useValue(y2) // expected-note {{access can happen concurrently}}
 }
 
 func funcTestTransferringArg() async {
   let x = NSObject()
   transferNSObjectToGlobalFunction(x) // expected-error {{sending 'x' risks causing data races}}
   // expected-note @-1 {{'x' used after being passed as a transferring parameter; Later uses could race}}
-  useValue(x) // expected-note {{potential concurrent access}}
+  useValue(x) // expected-note {{access can happen concurrently}}
 }

test/Concurrency/sendable_checking.swift

@@ -282,7 +282,7 @@ func testNonSendableBaseArg() async {
 
   _ = 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-tns-note@-2 {{potential concurrent access}}
+  // expected-tns-note@-2 {{access can happen concurrently}}
 }
 
 @available(SwiftStdlib 5.1, *)

test/Concurrency/transfernonsendable.sil

@@ -160,7 +160,7 @@ bb0:
   // expected-warning @-1 {{}}
   %useIndirect = function_ref @useIndirect : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
   apply %useIndirect<NonSendableKlass>(%1) : $@convention(thin) <τ_0_0> (@in_guaranteed τ_0_0) -> ()
-  // expected-note @-1 {{potential concurrent access}}
+  // expected-note @-1 {{access can happen concurrently}}
 
   destroy_addr %1 : $*NonSendableKlass
   dealloc_stack %1 : $*NonSendableKlass

test/Concurrency/transfernonsendable.swift

@@ -47,7 +47,7 @@ bb3:
   // expected-warning @-1 {{}}
   %useKlass = function_ref @useKlass : $@convention(thin) (@guaranteed NonSendableKlass) -> ()
   apply %useKlass(%klass) : $@convention(thin) (@guaranteed NonSendableKlass) -> ()
-  // expected-note @-1 {{potential concurrent access}}
+  // expected-note @-1 {{access can happen concurrently}}
   destroy_value %klass : $NonSendableKlass
   %9999 = tuple ()
   return %9999 : $()

test/Concurrency/transfernonsendable_asynclet.swift

@@ -58,7 +58,7 @@ func initActorWithSyncNonIsolatedInit() {
   // TODO: This should say actor isolated.
   _ = ActorWithSynchronousNonIsolatedInit(k) // expected-error {{sending 'k' risks causing data races}}
   // expected-note @-1 {{sending 'k' to actor-isolated initializer 'init(_:)' risks causing data races between actor-isolated and local nonisolated uses}}
-  let _ = { @MainActor in // expected-note {{potential concurrent access}}
+  let _ = { @MainActor in // expected-note {{access can happen concurrently}}
     print(k)
   }
 }
@@ -87,7 +87,7 @@ func initActorWithAsyncIsolatedInit() async {
   // TODO: This should say actor isolated.
   _ = await ActorWithAsyncIsolatedInit(k) // expected-error {{sending 'k' risks causing data races}}
   // expected-note @-1 {{sending 'k' to actor-isolated initializer 'init(_:)' risks causing data races between actor-isolated and local nonisolated uses}}
-  let _ = { @MainActor in // expected-note {{potential concurrent access}}
+  let _ = { @MainActor in // expected-note {{access can happen concurrently}}
     print(k)
   }
 }
@@ -155,7 +155,7 @@ func initClassWithAsyncIsolatedInit() async {
   // MainActor.
   _ = await ClassWithAsyncIsolatedInit(k) // expected-error {{sending 'k' risks causing data races}}
   // expected-note @-1 {{sending 'k' to global actor 'CustomActor'-isolated initializer 'init(_:)' risks causing data races between global actor 'CustomActor'-isolated and local nonisolated uses}}
-  let _ = { @MainActor in // expected-note {{potential concurrent access}}
+  let _ = { @MainActor in // expected-note {{access can happen concurrently}}
     print(k)
   }
 }