[region-isolation] Convert UseAfterTransfer's typed isolation transfer error to the split small error/large note format we are standardizing on.

I also cleaned up the diagnostic a little bit.

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -971,6 +971,16 @@ ERROR(regionbasedisolation_named_transfer_yields_race, none,
 NOTE(regionbasedisolation_type_is_non_sendable, none,
       "%0 is a non-Sendable type",
       (Type))
+ERROR(regionbasedisolation_type_transfer_yields_race, none,
+      "sending value of non-Sendable type %0 risks causing data races",
+      (Type))
+
+NOTE(regionbasedisolation_type_use_after_transfer, none,
+      "sending value of non-Sendable type %0 to %1 callee risks causing data races between %1 and local %2 uses",
+      (Type, ActorIsolation, ActorIsolation))
+NOTE(regionbasedisolation_type_use_after_transfer_callee, none,
+      "sending value of non-Sendable type %0 to %1 %2 %3 risks causing data races between %1 and local %4 uses",
+      (Type, ActorIsolation, DescriptiveDeclKind, DeclName, ActorIsolation))
 
 ERROR(regionbasedisolation_inout_sending_cannot_be_actor_isolated, none,
       "'inout sending' parameter %0 cannot be %1at end of function",

lib/SILOptimizer/Mandatory/TransferNonSendable.cpp

@@ -701,12 +701,21 @@ class UseAfterTransferDiagnosticEmitter {
 
   void emitTypedIsolationCrossing(SILLocation loc, Type inferredType,
                                   ApplyIsolationCrossing isolationCrossing) {
-    diagnoseError(
-        loc, diag::regionbasedisolation_transfer_yields_race_with_isolation,
-        inferredType, isolationCrossing.getCallerIsolation(),
-        isolationCrossing.getCalleeIsolation())
-        .highlight(loc.getSourceRange())
+    diagnoseError(loc, diag::regionbasedisolation_type_transfer_yields_race,
+                  inferredType)
         .limitBehaviorIf(getBehaviorLimit());
+
+    if (auto calleeInfo = getTransferringCalleeInfo()) {
+      diagnoseNote(loc,
+                   diag::regionbasedisolation_type_use_after_transfer_callee,
+                   inferredType, isolationCrossing.getCalleeIsolation(),
+                   calleeInfo->first, calleeInfo->second,
+                   isolationCrossing.getCallerIsolation());
+    } else {
+      diagnoseNote(loc, diag::regionbasedisolation_type_use_after_transfer,
+                   inferredType, isolationCrossing.getCalleeIsolation(),
+                   isolationCrossing.getCallerIsolation());
+    }
     emitRequireInstDiagnostics();
   }
 

test/Concurrency/transfernonsendable.sil

@@ -159,6 +159,7 @@ bb0:
   %f2 = function_ref @transferIndirect : $@convention(thin) @async <τ_0_0> (@in_guaranteed τ_0_0) -> ()
   apply [caller_isolation=nonisolated] [callee_isolation=global_actor] %f2<NonSendableKlass>(%1) : $@convention(thin) @async <τ_0_0> (@in_guaranteed τ_0_0) -> ()
   // expected-warning @-1 {{}}
+  // expected-note @-2 {{}}
   %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 {{access can happen concurrently}}

test/Concurrency/transfernonsendable_cfg.sil

@@ -45,6 +45,7 @@ bb3:
   %transferKlass = function_ref @transferKlass : $@convention(thin) @async (@guaranteed NonSendableKlass) -> ()
   apply [caller_isolation=nonisolated] [callee_isolation=global_actor] %transferKlass(%klass) : $@convention(thin) @async (@guaranteed NonSendableKlass) -> ()
   // expected-warning @-1 {{}}
+  // expected-note @-2 {{}}
   %useKlass = function_ref @useKlass : $@convention(thin) (@guaranteed NonSendableKlass) -> ()
   apply %useKlass(%klass) : $@convention(thin) (@guaranteed NonSendableKlass) -> ()
   // expected-note @-1 {{access can happen concurrently}}

test/Concurrency/transfernonsendable_instruction_matching.sil

@@ -84,6 +84,7 @@ bb0:
 
   %transfer = function_ref @transferLinearFunction : $@async @convention(thin) (@guaranteed @differentiable(_linear) @callee_guaranteed (Float) -> Float) -> ()
   apply [caller_isolation=nonisolated] [callee_isolation=global_actor] %transfer(%0) : $@async @convention(thin) (@guaranteed @differentiable(_linear) @callee_guaranteed (Float) -> Float) -> () // expected-warning {{}}
+  // expected-note @-1 {{}}
 
   // No error since this is just look through.
   %1 = begin_borrow %0 : $@differentiable(_linear) @callee_guaranteed (Float) -> Float
@@ -104,6 +105,7 @@ bb0:
 
   %transfer = function_ref @transferDifferentiableFunction : $@async @convention(thin) (@guaranteed @differentiable(reverse) @callee_guaranteed (Float) -> Float) -> ()
   apply [caller_isolation=nonisolated] [callee_isolation=global_actor] %transfer(%0) : $@async @convention(thin) (@guaranteed @differentiable(reverse) @callee_guaranteed (Float) -> Float) -> () // expected-warning {{}}
+  // expected-note @-1 {{}}
 
   // No error since this is just look through.
   %1 = begin_borrow %0 : $@differentiable(reverse) @callee_guaranteed (Float) -> Float
@@ -124,6 +126,7 @@ bb0:
 
   %transfer = function_ref @transferFunction : $@async @convention(thin) (@guaranteed @callee_guaranteed (Float) -> Float) -> ()
   apply [caller_isolation=nonisolated] [callee_isolation=global_actor] %transfer(%1) : $@async @convention(thin) (@guaranteed @callee_guaranteed (Float) -> Float) -> () // expected-warning {{}}
+  // expected-note @-1 {{}}
 
   %2 = begin_borrow %1 : $@callee_guaranteed (Float) -> Float
   %3 = linear_function [parameters 0] %2 : $@callee_guaranteed (Float) -> Float // expected-note {{access can happen concurrently}}
@@ -145,6 +148,7 @@ bb0:
 
   %transfer = function_ref @transferFunction : $@async @convention(thin) (@guaranteed @callee_guaranteed (Float) -> Float) -> ()
   apply [caller_isolation=nonisolated] [callee_isolation=global_actor] %transfer(%1) : $@async @convention(thin) (@guaranteed @callee_guaranteed (Float) -> Float) -> () // expected-warning {{}}
+  // expected-note @-1 {{}}
 
   %derivative = function_ref @derivative : $@convention(thin) (Float) -> (Float, @owned @callee_guaranteed (Float) -> Float)
   %vjp = function_ref @vjp : $@convention(thin) (Float) -> (Float, @owned @callee_guaranteed (Float) -> Float)

test/Concurrency/transfernonsendable_instruction_matching_differentiability.sil

@@ -667,8 +667,8 @@ func test_tuple_formation(a : A, i : Int) async {
     foo_noniso(ns012);
     foo_noniso(ns13);
   case 4:
-    await a.foo(ns012) // expected-tns-warning {{sending value of non-Sendable type '(NonSendable, NonSendable, NonSendable)' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
-    // TODO: Interestingly with complete, we emit this error 3 times?!
+    await a.foo(ns012) // expected-tns-warning {{sending value of non-Sendable type '(NonSendable, NonSendable, NonSendable)' risks causing data races}}
+    // expected-tns-note @-1 {{sending value of non-Sendable type '(NonSendable, NonSendable, NonSendable)' to actor-isolated instance method 'foo' risks causing data races between actor-isolated and local nonisolated uses}}
     // expected-complete-warning @-2 3{{passing argument of non-sendable type '(NonSendable, NonSendable, NonSendable)' into actor-isolated context may introduce data races}}
 
     if bool {
@@ -687,7 +687,8 @@ func test_tuple_formation(a : A, i : Int) async {
       foo_noniso(ns13); // expected-tns-note {{access can happen concurrently}}
     }
   default:
-    await a.foo(ns13) // expected-tns-warning {{sending value of non-Sendable type '(NonSendable, NonSendable)' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+      await a.foo(ns13) // expected-tns-warning {{sending value of non-Sendable type '(NonSendable, NonSendable)' risks causing data races}}
+      // expected-tns-note @-1 {{sending value of non-Sendable type '(NonSendable, NonSendable)' to actor-isolated instance method 'foo' risks causing data races between actor-isolated and local nonisolated uses}}
     // expected-complete-warning @-1 2{{passing argument of non-sendable type '(NonSendable, NonSendable)' into actor-isolated context may introduce data races}}
 
     if bool {
@@ -823,9 +824,10 @@ func one_consume_many_require_varag(a : A) async {
   let ns3 = NonSendable();
   let ns4 = NonSendable();
 
-  //TODO: find a way to make the type used in the diagnostic more specific than the signature type
+  // TODO: find a way to make the type used in the diagnostic more specific than the signature type
   await a.foo_vararg(ns0, ns1, ns2);
-  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' risks causing data races}}
+  // expected-tns-note @-2 {{sending value of non-Sendable type 'Any...' to actor-isolated instance method 'foo_vararg' risks causing data races between actor-isolated and local nonisolated uses}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any...' into actor-isolated context may introduce data races}}
 
   if bool {
@@ -843,7 +845,8 @@ func one_consume_one_require_vararg(a : A) async {
   let ns2 = NonSendable();
 
   await a.foo_vararg(ns0, ns1, ns2);
-  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' risks causing data races}}
+  // expected-tns-note @-2 {{sending value of non-Sendable type 'Any...' to actor-isolated instance method 'foo_vararg' risks causing data races between actor-isolated and local nonisolated uses}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any...' into actor-isolated context may introduce data races}}
 
   foo_noniso_vararg(ns0, ns1, ns2); // expected-tns-note 1{{access can happen concurrently}}
@@ -858,13 +861,16 @@ func many_consume_one_require_vararg(a : A) async {
   let ns5 = NonSendable();
 
   await a.foo_vararg(ns0, ns3, ns3)
-  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' risks causing data races}}
+  // expected-tns-note @-2 {{sending value of non-Sendable type 'Any...' to actor-isolated instance method 'foo_vararg' risks causing data races between actor-isolated and local nonisolated uses}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any...' into actor-isolated context may introduce data races}}
   await a.foo_vararg(ns4, ns1, ns4)
-  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' risks causing data races}}
+  // expected-tns-note @-2 {{sending value of non-Sendable type 'Any...' to actor-isolated instance method 'foo_vararg' risks causing data races between actor-isolated and local nonisolated uses}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any...' into actor-isolated context may introduce data races}}
   await a.foo_vararg(ns5, ns5, ns2)
-  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' risks causing data races}}
+  // expected-tns-note @-2 {{sending value of non-Sendable type 'Any...' to actor-isolated instance method 'foo_vararg' risks causing data races between actor-isolated and local nonisolated uses}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any...' into actor-isolated context may introduce data races}}
 
   foo_noniso_vararg(ns0, ns1, ns2); // expected-tns-note 3{{access can happen concurrently}}
@@ -881,13 +887,16 @@ func many_consume_many_require_vararg(a : A) async {
   let ns7 = NonSendable();
 
   await a.foo_vararg(ns0, ns3, ns3)
-  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' risks causing data races}}
+  // expected-tns-note @-2 {{sending value of non-Sendable type 'Any...' to actor-isolated instance method 'foo_vararg' risks causing data races between actor-isolated and local nonisolated uses}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any...' into actor-isolated context may introduce data races}}
   await a.foo_vararg(ns4, ns1, ns4)
-  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' risks causing data races}}
+  // expected-tns-note @-2 {{sending value of non-Sendable type 'Any...' to actor-isolated instance method 'foo_vararg' risks causing data races between actor-isolated and local nonisolated uses}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any...' into actor-isolated context may introduce data races}}
   await a.foo_vararg(ns5, ns5, ns2)
-  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+  // expected-tns-warning @-1 {{sending value of non-Sendable type 'Any...' risks causing data races}}
+  // expected-tns-note @-2 {{sending value of non-Sendable type 'Any...' to actor-isolated instance method 'foo_vararg' risks causing data races between actor-isolated and local nonisolated uses}}
   // expected-complete-warning @-2 {{passing argument of non-sendable type 'Any...' into actor-isolated context may introduce data races}}
 
   if bool {
@@ -925,7 +934,8 @@ func enum_test(a : A) async {
     case .E2:
       switch (e3) {
       case let .E3(ns3):
-        await a.foo(ns3.x); // expected-tns-warning {{sending value of non-Sendable type 'Any' with later accesses from nonisolated context to actor-isolated context risks causing data races}}
+        await a.foo(ns3.x) // expected-tns-warning {{sending value of non-Sendable type 'Any' risks causing data races}}
+        // expected-tns-note @-1 {{sending value of non-Sendable type 'Any' to actor-isolated instance method 'foo' risks causing data races between actor-isolated and local nonisolated uses}}
         // expected-complete-warning @-1 {{passing argument of non-sendable type 'Any' into actor-isolated context may introduce data races}}
       default: ()
       }

test/Concurrency/transfernonsendable_region_based_sendability.swift

@@ -0,0 +1,31 @@
+// RUN: %target-swift-frontend -swift-version 6 -Xllvm -sil-regionbasedisolation-force-use-of-typed-errors -emit-sil -o /dev/null %s -verify
+
+// REQUIRES: concurrency
+// REQUIRES: asserts
+
+// READ THIS: This test is only intended to test typed errors that are fallback
+// error paths that are only invoked if we can't find a name for the value being
+// sent. Since in most cases we are able to infer a name, we do not invoke these
+// very often (and in truth in normal compilation we would like to never emit
+// them). To make sure that we can at least test them out, this test uses an
+// asserts only option that causes us to emit typed errors even when we find a
+// name.
+
+////////////////////////
+// MARK: Declarations //
+////////////////////////
+
+class NonSendableKlass {}
+
+@MainActor func transferToMain<T>(_ t: T) async {}
+
+/////////////////
+// MARK: Tests //
+/////////////////
+
+func simpleUseAfterFree() async {
+  let x = NonSendableKlass()
+  await transferToMain(x) // expected-error {{sending value of non-Sendable type 'NonSendableKlass' risks causing data races}}
+  // expected-note @-1 {{sending value of non-Sendable type 'NonSendableKlass' to main actor-isolated global function 'transferToMain' risks causing data races between main actor-isolated and local nonisolated uses}}
+  print(x) // expected-note {{access can happen concurrently}}
+}