Merge pull request #40073 from DougGregor/actor-isolation-infer-dynamic-replacement

Author: swift-ci

lib/Sema/TypeCheckConcurrency.cpp

@@ -3353,6 +3353,13 @@ ActorIsolation ActorIsolationRequest::evaluate(
       return inferredIsolation(isolation);
   }
 
+  // If this is a dynamic replacement for another function, use the
+  // actor isolation of the function it replaces.
+  if (auto replacedDecl = value->getDynamicallyReplacedDecl()) {
+    if (auto isolation = getActorIsolation(replacedDecl))
+      return inferredIsolation(isolation);
+  }
+
   if (shouldInferAttributeInContext(value->getDeclContext())) {
     // If the declaration witnesses a protocol requirement that is isolated,
     // use that.

test/Concurrency/Inputs/dynamically_replaceable.swift

@@ -0,0 +1,2 @@
+@MainActor
+public dynamic func dynamicOnMainActor() { }

test/Concurrency/global_actor_inference.swift

@@ -1,5 +1,8 @@
-// RUN: %target-typecheck-verify-swift  -disable-availability-checking
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -emit-module-path %t/dynamically_replaceable.swiftmodule -module-name dynamically_replaceable -warn-concurrency %S/Inputs/dynamically_replaceable.swift
+// RUN: %target-typecheck-verify-swift -I %t -disable-availability-checking
 // REQUIRES: concurrency
+import dynamically_replaceable
 
 actor SomeActor { }
 
@@ -552,3 +555,11 @@ func useFooInADefer() -> String {
 
   return "hello"
 }
+
+// ----------------------------------------------------------------------
+// Dynamic replacement
+// ----------------------------------------------------------------------
+@_dynamicReplacement(for: dynamicOnMainActor)
+func replacesDynamicOnMainActor() {
+  onlyOnMainActor()
+}