Merge pull request #39876 from DougGregor/mainactor-run-hop-back-5.5

Author: DougGregor

lib/SILGen/SILGenProlog.cpp

@@ -611,7 +611,7 @@ SILValue SILGenFunction::emitLoadGlobalActorExecutor(Type globalActor) {
     actorType->getTypeOfMember(SGM.SwiftModule, sharedInstanceDecl);
 
   auto metaRepr =
-    nominal->isResilient(SGM.SwiftModule, ResilienceExpansion::Maximal)
+    nominal->isResilient(SGM.SwiftModule, F.getResilienceExpansion())
     ? MetatypeRepresentation::Thick
     : MetatypeRepresentation::Thin;
 

stdlib/public/Concurrency/MainActor.swift

@@ -45,14 +45,26 @@ import Swift
 @available(SwiftStdlib 5.5, *)
 extension MainActor {
   /// Execute the given body closure on the main actor.
-  public static func run<T>(
+  ///
+  /// Historical ABI entry point, superceded by the Sendable version that is
+  /// also inlined to back-deploy a semantic fix where this operation would
+  /// not hop back at the end.
+  @_silgen_name("$sScM3run10resultType4bodyxxm_xyYbKScMYcXEtYaKlFZ")
+  @usableFromInline
+  static func _historicalRunForABI<T>(
     resultType: T.Type = T.self,
     body: @MainActor @Sendable () throws -> T
   ) async rethrows -> T {
-    @MainActor func runOnMain(body: @MainActor @Sendable () throws -> T) async rethrows -> T {
-      return try body()
-    }
+    return try await body()
+  }
 
-    return try await runOnMain(body: body)
+  /// Execute the given body closure on the main actor.
+  @_silgen_name("$sScM12runAndReturn10resultType4bodyxxm_xyYbKScMYcXEtYaKlFZ")
+  @_alwaysEmitIntoClient
+  public static func run<T>(
+    resultType: T.Type = T.self,
+    body: @MainActor @Sendable () throws -> T
+  ) async rethrows -> T {
+    return try await body()
   }
 }

test/Concurrency/Runtime/mainactor.swift

@@ -80,6 +80,10 @@ actor A {
 // CHECK-NOT: ERROR
 // CHECK: finished with return counter = 4
 
+// CHECK: detached task not on main queue
+// CHECK: on main queue again
+// CHECK: detached task hopped back
+
 @main struct RunIt {
   static func main() async {
     print("starting")
@@ -90,5 +94,25 @@ actor A {
     }
     let result = await someFunc()
     print("finished with return counter = \(result)")
+
+    // Check actor hopping with MainActor.run.
+    let task = Task.detached {
+      if checkIfMainQueue(expectedAnswer: false) {
+        print("detached task not on main queue")
+      } else {
+        print("ERROR: detached task is on the main queue?")
+      }
+
+      _ = await MainActor.run {
+        checkAnotherFn(1)
+      }
+
+      if checkIfMainQueue(expectedAnswer: false) {
+        print("detached task hopped back")
+      } else {
+        print("ERROR: detached task is on the main queue?")
+      }
+    }
+    _ = await task.value
   }
 }