Merge pull request swiftlang#74762 from ktoso/pick-wip-whenLocal-adjust

[6.0][Distributed] Adjust whenLocal impl to avoid potential ABI issues

Author: tbkka

stdlib/public/Distributed/DistributedActor.swift

@@ -363,6 +363,9 @@ extension DistributedActor {
   ///
   /// When the actor is remote, the closure won't be executed and this function will return nil.
   @_alwaysEmitIntoClient
+  // we need to silgen_name here because the signature is the same as __abi_whenLocal,
+  // and even though this is @AEIC, the symbol name would conflict.
+  @_silgen_name("$s11Distributed0A5ActorPAAE20whenLocalTypedThrowsyqd__Sgqd__xYiYaYbqd_0_YKXEYaqd_0_YKs8SendableRd__s5ErrorRd_0_r0_lF")
   public nonisolated func whenLocal<T: Sendable, E>(
     _ body: @Sendable (isolated Self) async throws(E) -> T
   ) async throws(E) -> T? {
@@ -374,6 +377,17 @@ extension DistributedActor {
     }
   }
 
+  // ABI: This is a workaround when in Swift 6 this method was introduced
+  // in order to support typed-throws, but missed to add @_aeic.
+  // In practice, this method should not ever be used by anyone, ever.
+  @usableFromInline
+  @_silgen_name("$s11Distributed0A5ActorPAAE9whenLocalyqd__Sgqd__xYiYaYbqd_0_YKXEYaqd_0_YKs8SendableRd__s5ErrorRd_0_r0_lF")
+  internal nonisolated func __abi_whenLocal<T: Sendable, E>(
+    _ body: @Sendable (isolated Self) async throws(E) -> T
+  ) async throws(E) -> T? {
+    try await whenLocal(body)
+  }
+
   // ABI: Historical whenLocal, rethrows was changed to typed throws `throws(E)`
   @_silgen_name("$s11Distributed0A5ActorPAAE9whenLocalyqd__Sgqd__xYiYaYbKXEYaKs8SendableRd__lF")
   @usableFromInline

test/abi/macOS/arm64/distributed.swift

@@ -104,3 +104,9 @@ Added: _$s11Distributed0A5ActorPAAE22__actorUnownedExecutorScevpMV
 
 // Distributed._distributedStubFatalError(function: Swift.String) -> Swift.Never
 Added: _$s11Distributed26_distributedStubFatalError8functions5NeverOSS_tF
+
+// Bin compat for typed throws overload of whenLocal
+// (extension in Distributed):Distributed.DistributedActor.whenLocal<A, B where A1: Swift.Sendable, B1: Swift.Error>(@Sendable (isolated A) async throws(B1) -> A1) async throws(B1) -> A1?
+Added: _$s11Distributed0A5ActorPAAE9whenLocalyqd__Sgqd__xYiYaYbqd_0_YKXEYaqd_0_YKs8SendableRd__s5ErrorRd_0_r0_lF
+// async function pointer to (extension in Distributed):Distributed.DistributedActor.whenLocal<A, B where A1: Swift.Sendable, B1: Swift.Error>(@Sendable (isolated A) async throws(B1) -> A1) async throws(B1) -> A1?
+Added: _$s11Distributed0A5ActorPAAE9whenLocalyqd__Sgqd__xYiYaYbqd_0_YKXEYaqd_0_YKs8SendableRd__s5ErrorRd_0_r0_lFTu

test/abi/macOS/x86_64/distributed.swift

@@ -104,3 +104,9 @@ Added: _$s11Distributed0A5ActorPAAE22__actorUnownedExecutorScevpMV
 
 // Distributed._distributedStubFatalError(function: Swift.String) -> Swift.Never
 Added: _$s11Distributed26_distributedStubFatalError8functions5NeverOSS_tF
+
+// Bin compat for typed throws overload of whenLocal
+// (extension in Distributed):Distributed.DistributedActor.whenLocal<A, B where A1: Swift.Sendable, B1: Swift.Error>(@Sendable (isolated A) async throws(B1) -> A1) async throws(B1) -> A1?
+Added: _$s11Distributed0A5ActorPAAE9whenLocalyqd__Sgqd__xYiYaYbqd_0_YKXEYaqd_0_YKs8SendableRd__s5ErrorRd_0_r0_lF
+// async function pointer to (extension in Distributed):Distributed.DistributedActor.whenLocal<A, B where A1: Swift.Sendable, B1: Swift.Error>(@Sendable (isolated A) async throws(B1) -> A1) async throws(B1) -> A1?
+Added: _$s11Distributed0A5ActorPAAE9whenLocalyqd__Sgqd__xYiYaYbqd_0_YKXEYaqd_0_YKs8SendableRd__s5ErrorRd_0_r0_lFTu