Merge pull request #71197 from hborla/isolated-parameter-sendable

Author: hborla

lib/Sema/TypeCheckConcurrency.cpp

@@ -3307,6 +3307,7 @@ namespace {
               KnownProtocolKind::Actor);
         }
 
+        mayExitToNonisolated = false;
         auto calleeIsolation = ActorIsolation::forActorInstanceParameter(
             const_cast<Expr *>(arg->findOriginalValue()), paramIdx);
 

test/Concurrency/isolated_parameters.swift

@@ -393,7 +393,7 @@ nonisolated func callFromNonisolated(ns: NotSendable) async {
   let myActor = A()
 
   await optionalIsolated(ns, to: myActor)
-  // expected-complete-warning@-1 {{passing argument of non-sendable type 'NotSendable' outside of main actor-isolated context may introduce data races}}
+  // expected-complete-warning@-1 {{passing argument of non-sendable type 'NotSendable' into actor-isolated context may introduce data races}}
 
   optionalIsolatedSync(ns, to: myActor)
   // expected-error@-1 {{expression is 'async' but is not marked with 'await'}}
@@ -439,6 +439,10 @@ func testNonSendableCaptures(ns: NotSendable, a: isolated MyActor) {
 
 func sync(isolatedTo actor: isolated (any Actor)?) {}
 
+func pass(value: NotSendable, isolation: isolated (any Actor)?) async -> NotSendable {
+  value
+}
+
 func preciseIsolated(a: isolated MyActor) async {
   sync(isolatedTo: a)
   sync(isolatedTo: nil) // okay from anywhere
@@ -461,3 +465,11 @@ func preciseIsolated(a: isolated MyActor) async {
     sync(isolatedTo: #isolation)
   }
 }
+
+@MainActor func fromMain(ns: NotSendable) async -> NotSendable {
+  await pass(value: ns, isolation: MainActor.shared)
+}
+
+nonisolated func fromNonisolated(ns: NotSendable) async -> NotSendable {
+  await pass(value: ns, isolation: nil)
+}