[Distributed] Synthesize 'distributed thunk' accessor for distributed computed properties

Author: xedin

lib/AST/ASTMangler.cpp

@@ -3192,6 +3192,14 @@ void ASTMangler::appendEntity(const ValueDecl *decl) {
   // Handle accessors specially, they are mangled as modifiers on the accessed
   // declaration.
   if (auto accessor = dyn_cast<AccessorDecl>(decl)) {
+    if (accessor->isDistributedThunk()) {
+      appendContextOf(decl);
+      appendDeclName(accessor->getStorage());
+      appendDeclType(accessor, FunctionMangling);
+      appendOperator("F");
+      return;
+    }
+
     return appendAccessorEntity(
         getCodeForAccessorKind(accessor->getAccessorKind()),
         accessor->getStorage(), accessor->isStatic());

lib/Sema/CodeSynthesisDistributedActor.cpp

@@ -725,11 +725,28 @@ static FuncDecl *createDistributedThunkFunction(FuncDecl *func) {
   }
   ParameterList *params = ParameterList::create(C, paramDecls); // = funcParams->clone(C);
 
-  auto thunk = FuncDecl::createImplicit(
-      C, swift::StaticSpellingKind::None, thunkName, SourceLoc(),
-      /*async=*/true, /*throws=*/true,
-      genericParamList, params,
-      func->getResultInterfaceType(), DC);
+  FuncDecl *thunk = nullptr;
+  if (auto *accessor = dyn_cast<AccessorDecl>(func)) {
+    auto *distributedVar = cast<VarDecl>(accessor->getStorage());
+
+    thunk = AccessorDecl::create(
+        C, /*declLoc=*/accessor->getLoc(), /*accessorKeywordLoc=*/SourceLoc(),
+        AccessorKind::Get, distributedVar,
+        /*staticLoc=*/SourceLoc(), StaticSpellingKind::None,
+        /*async=*/true, /*asyncLoc=*/SourceLoc(),
+        /*throws=*/true, /*throwsLoc=*/SourceLoc(), genericParamList, params,
+        func->getResultInterfaceType(), accessor->getDeclContext());
+
+    thunk->setImplicit();
+  } else {
+    thunk = FuncDecl::createImplicit(
+        C, swift::StaticSpellingKind::None, func->getName(), SourceLoc(),
+        /*async=*/true, /*throws=*/true, genericParamList, params,
+        func->getResultInterfaceType(), DC);
+  }
+
+  assert(thunk && "couldn't create a distributed thunk");
+
   thunk->setSynthesized(true);
   thunk->getAttrs().add(new (C) NonisolatedAttr(/*isImplicit=*/true));
 

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_computedProperty.swift

@@ -21,7 +21,7 @@ typealias DefaultDistributedActorSystem = FakeRoundtripActorSystem
 
 distributed actor Greeter {
   distributed var theDistributedProperty: String {
-    "Patrik the Seastar"
+    "Patrick the Seastar"
   }
 }
 
@@ -32,10 +32,10 @@ func test() async throws {
   let ref = try Greeter.resolve(id: local.id, using: system)
 
   let reply = try await ref.theDistributedProperty
-  // CHECK: >> remoteCall: on:main.Greeter, target:main.Greeter.name, invocation:FakeInvocationEncoder(genericSubs: [], arguments: [], returnType: Optional(Swift.String), errorType: nil), throwing:Swift.Never, returning:Swift.String
+  // CHECK: >> remoteCall: on:main.Greeter, target:main.Greeter.theDistributedProperty(), invocation:FakeInvocationEncoder(genericSubs: [], arguments: [], returnType: Optional(Swift.String), errorType: nil), throwing:Swift.Never, returning:Swift.String
   // CHECK: << remoteCall return: Patrick the Seastar
   print("reply: \(reply)")
-  // CHECK: reply: Echo: Caplin
+  // CHECK: reply: Patrick the Seastar
 }
 
 @main struct Main {