Merge pull request #74563 from hborla/6.0-isolated-parameter-checking

[6.0][Concurrency] Calls that pass an isolated parameter matching the isolation of the context do not exit to nonisolated.

Author: hborla

lib/Sema/TypeCheckConcurrency.cpp

@@ -3457,21 +3457,18 @@ namespace {
 
         argForIsolatedParam = arg;
         unsatisfiedIsolation = std::nullopt;
+
+        // Assume that a callee with an isolated parameter does not
+        // cross an isolation boundary. We'll set this again below if
+        // the given isolated argument doesn't match the isolation of the
+        // caller.
+        mayExitToNonisolated = false;
+
+        // If the argument is an isolated parameter from the enclosing context,
+        // or #isolation, then the call does not cross an isolation boundary.
         if (getIsolatedActor(arg) || isa<CurrentContextIsolationExpr>(arg))
           continue;
 
-        // An isolated parameter was provided with a non-isolated argument.
-        // FIXME: The modeling of unsatisfiedIsolation is not great here.
-        // We'd be better off using something more like closure isolation
-        // that can talk about specific parameters.
-        auto nominal = getType(arg)->getAnyNominal();
-        if (!nominal) {
-          // FIXME: This is wrong for distributed actors.
-          nominal = getType(arg)->getASTContext().getProtocol(
-              KnownProtocolKind::Actor);
-        }
-
-        mayExitToNonisolated = false;
         auto calleeIsolation = ActorIsolation::forActorInstanceParameter(
             const_cast<Expr *>(arg->findOriginalValue()), paramIdx);
 

test/Concurrency/isolated_parameter_valid.swift

@@ -0,0 +1,18 @@
+// RUN: %target-swift-frontend -disable-availability-checking -swift-version 6 %s -emit-sil -o /dev/null -verify
+
+public func doNotCross(
+  isolation: isolated (any Actor)? = #isolation,
+  _ block: () async -> Void
+) async {
+  await block()
+}
+
+actor MyActor {
+  func doStuff() {}
+
+  func test() async {
+    await doNotCross {
+      doStuff()
+    }
+  }
+}