fix the linkage of async func ptr to distributed accessors

Author: ktoso

include/swift/IRGen/Linking.h

@@ -1268,8 +1268,7 @@ class LinkEntity {
 
     case LinkEntity::Kind::DistributedAccessor: {
       entity.Data = LINKENTITY_SET_FIELD(
-          Kind,
-          unsigned(LinkEntity::Kind::DistributedAccessorAsyncPointer));
+          Kind, unsigned(LinkEntity::Kind::DistributedAccessorAsyncPointer));
       break;
     }
 

lib/IRGen/Linking.cpp

@@ -880,11 +880,10 @@ SILLinkage LinkEntity::getLinkage(ForDefinition_t forDefinition) const {
   case Kind::KnownAsyncFunctionPointer:
     return SILLinkage::PublicExternal;
   case Kind::PartialApplyForwarder:
-  case Kind::DistributedAccessor:
     return SILLinkage::Private;
+  case Kind::DistributedAccessor:
   case Kind::AccessibleFunctionRecord:
-    return getSILFunction()->isDistributed() ? SILLinkage::Private
-                                             : SILLinkage::Shared;
+    return SILLinkage::Shared;
   case Kind::ExtendedExistentialTypeShape:
     return (isExtendedExistentialTypeShapeShared()
               ? SILLinkage::Shared : SILLinkage::Private);

test/IRGen/runtime_attributes_on_distributed_actors.swift

@@ -6,19 +6,17 @@
 // REQUIRES: OS=macosx
 // REQUIRES: concurrency
 
-// CHECK: @"$s28runtime_attributes_on_actors9TestActorC15asyncExternallyyyKcvpfaAA17FlagForAsyncFuncsHF"
-// CHECK: @"$s28runtime_attributes_on_actors9TestActorC11doSomethingyyYaKcvpfaAA17FlagForAsyncFuncsHF"
-// CHECK: @"$s28runtime_attributes_on_actors9TestActorC11doSomethingyySiYacvpfaAA17FlagForAsyncFuncsHF"
-// CHECK: @"$s28runtime_attributes_on_actors9TestActorC11doSomething_1xySi_SaySiGztYacvpfaAA17FlagForAsyncFuncsHF"
-// CHECK: @"$s28runtime_attributes_on_actors13globalAsyncFnSaySSGyYacvpfaAA07FlagForF5FuncsHF"
-
-// CHECK: @"$s28runtime_attributes_on_actors17FlagForAsyncFuncsVHa" = internal constant
-// CHECK-SAME: i32 5
-// CHECK-SAME: %swift.accessible_function* @"$s28runtime_attributes_on_actors9TestActorC15asyncExternallyyyKcvpfaAA17FlagForAsyncFuncsHF"
-// CHECK-SAME: %swift.accessible_function* @"$s28runtime_attributes_on_actors9TestActorC11doSomethingyyYaKcvpfaAA17FlagForAsyncFuncsHF"
-// CHECK-SAME: %swift.accessible_function* @"$s28runtime_attributes_on_actors9TestActorC11doSomethingyySiYacvpfaAA17FlagForAsyncFuncsHF"
-// CHECK-SAME: %swift.accessible_function* @"$s28runtime_attributes_on_actors9TestActorC11doSomething_1xySi_SaySiGztYacvpfaAA17FlagForAsyncFuncsHF"
-// CHECK-SAME: %swift.accessible_function* @"$s28runtime_attributes_on_actors13globalAsyncFnSaySSGyYacvpfaAA07FlagForF5FuncsHF"
+// : @"$s28runtime_attributes_on_distributed_actors9TestActorC15asyncExternallyyyKcvpfaAA17FlagForAsyncFuncsHF"
+// : @"$s28runtime_attributes_on_distributed_actors9TestActorC11doSomethingyyYaKcvpfaAA17FlagForAsyncFuncsHF"
+// : @"$s28runtime_attributes_on_distributed_actors9TestActorC11doSomethingyySiYacvpfaAA17FlagForAsyncFuncsHF"
+// : @"$s28runtime_attributes_on_distributed_actors9TestActorC11doSomething_1xySi_SaySiGztYacvpfaAA17FlagForAsyncFuncsHF"
+
+// : @"$s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVHa" = internal constant
+// SAME: i32 5   4
+// SAME: %swift.accessible_function* @"s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVAA9TestActorC15asyncExternallyyyKFfaHF"
+// SAME: %swift.accessible_function* @"$s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVAA9TestActorC11doSomethingyyYaKFfaHF"
+// SAME: %swift.accessible_function* @"$s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVAA9TestActorC11doSomethingyySiYaFfaHF"
+// SAME: %swift.accessible_function* @"$s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVAA9TestActorC11doSomething_1xySi_SaySiGtYaFfaHF"
 
 import Distributed
 
@@ -33,15 +31,15 @@ struct FlagForAsyncFuncs {
 distributed actor TestActor {
   typealias ActorSystem = LocalTestingDistributedActorSystem
 
-  // CHECK-LABEL: define hidden swiftcc void @"$s28runtime_attributes_on_actors9TestActorC15asyncExternallyyyKcvpfaAA17FlagForAsyncFuncs"(%T28runtime_attributes_on_actors17FlagForAsyncFuncsVSg* noalias nocapture sret(%T28runtime_attributes_on_actors17FlagForAsyncFuncsVSg) %0)
+  // CHECK-LABEL: define hidden swiftcc void @"$s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVAA9TestActorC15asyncExternallyyyKFfa"(%T40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVSg* noalias nocapture sret(%T40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVSg) %0)
   @FlagForAsyncFuncs distributed func asyncExternally() throws {}
 
-  // CHECK-LABEL: define hidden swiftcc void @"$s28runtime_attributes_on_actors9TestActorC11doSomethingyyYaKcvpfaAA17FlagForAsyncFuncs"(%T28runtime_attributes_on_actors17FlagForAsyncFuncsVSg* noalias nocapture sret(%T28runtime_attributes_on_actors17FlagForAsyncFuncsVSg) %0)
+  // CHECK-LABEL: define hidden swiftcc void @"$s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVAA9TestActorC11doSomethingyyYaKFfa"(%T40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVSg* noalias nocapture sret(%T40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVSg) %0)
   @FlagForAsyncFuncs distributed func doSomething() async throws {}
 
-  // CHECK-LABEL: define hidden swiftcc void @"$s28runtime_attributes_on_actors9TestActorC11doSomethingyySiYacvpfaAA17FlagForAsyncFuncs"(%T28runtime_attributes_on_actors17FlagForAsyncFuncsVSg* noalias nocapture sret(%T28runtime_attributes_on_actors17FlagForAsyncFuncsVSg) %0)
+  // CHECK-LABEL: define hidden swiftcc void @"$s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVAA9TestActorC11doSomethingyySiYaFfa"(%T40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVSg* noalias nocapture sret(%T40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVSg) %0)
   @FlagForAsyncFuncs nonisolated func doSomething(_: Int) async {}
 
-  // CHECK-LABEL: define hidden swiftcc void @"$s28runtime_attributes_on_actors9TestActorC11doSomething_1xySi_SaySiGztYacvpfaAA17FlagForAsyncFuncs"(%T28runtime_attributes_on_actors17FlagForAsyncFuncsVSg* noalias nocapture sret(%T28runtime_attributes_on_actors17FlagForAsyncFuncsVSg) %0)
+  // CHECK-LABEL: define hidden swiftcc void @"$s40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVAA9TestActorC11doSomething_1xySi_SaySiGtYaFfa"(%T40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVSg* noalias nocapture sret(%T40runtime_attributes_on_distributed_actors17FlagForAsyncFuncsVSg) %0)
   @FlagForAsyncFuncs distributed func doSomething(_: Int, x: [Int]) async {}
 }

test/type/runtime_discoverable_attrs_distributed.swift

@@ -11,20 +11,18 @@ typealias DefaultDistributedActorSystem = LocalTestingDistributedActorSystem
 
 @runtimeMetadata
 struct FlagForAsyncFuncs {
-  init<Act>(attachedTo: (Act) async throws -> Void) {}
-  init<Act>(attachedTo: (Act, Int, inout [Int]) async throws -> Void) {}
-  init<Act>(attachedTo: (Act, Int) async -> Void) {}
+  init<Act: DistributedActor>(attachedTo: (Act) async throws -> Void) {}
+  init<Act: DistributedActor>(attachedTo: (Act, Int, [Int]) async throws -> Void) {}
+  init<Act: DistributedActor>(attachedTo: (Act, Int) async -> Void) {}
   init(attachedTo: () async -> [String]) {}
 }
 
 @ActorFlag
 distributed actor TestDistributedActor {
+  @FlagForAsyncFuncs distributed func asyncExternallyAsyncDist() {} // ok
   @FlagForAsyncFuncs distributed func asyncExternallyDist() throws {} // ok
-
   @FlagForAsyncFuncs distributed func doSomethingDist() async throws {} // ok
-
   @FlagForAsyncFuncs nonisolated func doSomethingNonisolated(_: Int) async {} // ok
-
   @FlagForAsyncFuncs distributed func doSomethingDist(_: Int, x: [Int]) async {} // ok
 }