Merge pull request #76920 from gottesmm/pr-4ab85a74d0641a99b3a480971f93b2f98f726e31

[region-isolation] Add a special error for when a closure captures a non-Sendable box.

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -1039,6 +1039,9 @@ NOTE(regionbasedisolation_typed_tns_passed_to_sending_closure_helper_have_value,
 NOTE(regionbasedisolation_typed_tns_passed_to_sending_closure_helper_have_value_task_isolated, none,
      "closure captures %0 which is accessible to code in the current task",
      (DeclName))
+NOTE(regionbasedisolation_typed_tns_passed_to_sending_closure_helper_have_boxed_value_task_isolated, none,
+     "closure captures reference to mutable %1 %0 which is accessible to code in the current task",
+     (DeclName, DescriptiveDeclKind))
 NOTE(regionbasedisolation_typed_tns_passed_to_sending_closure_helper_have_value_region, none,
      "closure captures %1 which is accessible to %0 code",
      (StringRef, DeclName))

lib/SILOptimizer/Mandatory/TransferNonSendable.cpp

@@ -1456,6 +1456,19 @@ class TransferNonTransferrableDiagnosticEmitter {
 
     auto capturedLoc = RegularLocation(capturedValue.getLoc());
     if (getIsolationRegionInfo().getIsolationInfo().isTaskIsolated()) {
+      // If we have a closure capture box, emit a special diagnostic.
+      if (auto *fArg = dyn_cast<SILFunctionArgument>(
+              getIsolationRegionInfo().getIsolationInfo().getIsolatedValue())) {
+        if (fArg->isClosureCapture() && fArg->getType().is<SILBoxType>()) {
+          auto diag = diag::
+              regionbasedisolation_typed_tns_passed_to_sending_closure_helper_have_boxed_value_task_isolated;
+          auto *decl = capturedValue.getDecl();
+          diagnoseNote(capturedLoc, diag, decl->getName(),
+                       decl->getDescriptiveKind());
+          return;
+        }
+      }
+
       auto diag = diag::
           regionbasedisolation_typed_tns_passed_to_sending_closure_helper_have_value_task_isolated;
       diagnoseNote(capturedLoc, diag, capturedValue.getDecl()->getName());

test/Concurrency/transfernonsendable.swift

@@ -1866,3 +1866,25 @@ extension MyActor {
   }
 }
 
+func nonSendableAllocBoxConsumingParameter(x: consuming SendableKlass) async throws {
+  try await withThrowingTaskGroup(of: Void.self) { group in
+    group.addTask { // expected-tns-warning {{passing closure as a 'sending' parameter risks causing data races between code in the current task and concurrent execution of the closure}}
+      useValue(x) // expected-tns-note {{closure captures reference to mutable parameter 'x' which is accessible to code in the current task}}
+    }
+
+    try await group.waitForAll()
+  }
+}
+
+func nonSendableAllocBoxConsumingVar() async throws {
+  var x = SendableKlass()
+  x = SendableKlass()
+
+  try await withThrowingTaskGroup(of: Void.self) { group in
+    group.addTask { // expected-tns-warning {{passing closure as a 'sending' parameter risks causing data races between code in the current task and concurrent execution of the closure}}
+      useValue(x) // expected-tns-note {{closure captures reference to mutable var 'x' which is accessible to code in the current task}}
+    }
+
+    try await group.waitForAll()
+  }
+}