[Distributed] Move to ActorIdentity protocol (#38362)

Author: ktoso

include/swift/AST/Decl.h

@@ -5262,12 +5262,6 @@ class VarDecl : public AbstractStorageDecl {
     });
   }
 
-  /// Whether the given name is actorAddress, which is used for distributed actors.
-  static bool isDistributedActorAddressName(ASTContext &ctx, DeclName name);
-
-  /// Whether the given name is actorTransport, which is used for distributed actors.
-  static bool isDistributedActorTransportName(ASTContext &ctx, DeclName name);
-
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) { 
     return D->getKind() == DeclKind::Var || D->getKind() == DeclKind::Param; 

include/swift/AST/KnownIdentifiers.def

@@ -254,11 +254,11 @@ IDENTIFIER(actor)
 IDENTIFIER(actorTransport)
 IDENTIFIER(actorType)
 IDENTIFIER(actorReady)
-IDENTIFIER(assignAddress)
-IDENTIFIER(resignAddress)
+IDENTIFIER(assignIdentity)
+IDENTIFIER(resignIdentity)
 IDENTIFIER(resolve)
-IDENTIFIER(address)
-IDENTIFIER(actorAddress)
+IDENTIFIER(id)
+IDENTIFIER(identifier)
 IDENTIFIER(_distributedActorRemoteInitialize)
 IDENTIFIER(_distributedActorDestroy)
 IDENTIFIER(__isRemoteActor)

include/swift/AST/KnownSDKTypes.def

@@ -46,6 +46,7 @@ KNOWN_SDK_TYPE_DECL(Concurrency, TaskLocal, ClassDecl, 1)
 // Distributed actors
 KNOWN_SDK_TYPE_DECL(Distributed, DistributedActor, ProtocolDecl, 0)
 KNOWN_SDK_TYPE_DECL(Distributed, ActorTransport, ProtocolDecl, 0)
-KNOWN_SDK_TYPE_DECL(Distributed, ActorAddress, StructDecl, 0)
+KNOWN_SDK_TYPE_DECL(Distributed, ActorIdentity, ProtocolDecl, 0)
+KNOWN_SDK_TYPE_DECL(Distributed, AnyActorIdentity, StructDecl, 0)
 
 #undef KNOWN_SDK_TYPE_DECL

include/swift/AST/TypeCheckRequests.h

@@ -2064,7 +2064,7 @@ enum class ImplicitMemberAction : uint8_t {
   ResolveEncodable,
   ResolveDecodable,
   ResolveDistributedActor,
-  ResolveDistributedActorAddress,
+  idResolveDistributedActorIdentity,
 };
 
 class ResolveImplicitMemberRequest

lib/AST/Decl.cpp

@@ -7816,17 +7816,6 @@ bool FuncDecl::isMainTypeMainMethod() const {
          getParameters()->size() == 0;
 }
 
-bool VarDecl::isDistributedActorAddressName(ASTContext &ctx, DeclName name) {
-  assert(name.getArgumentNames().size() == 0);
-  return name.getBaseName() == ctx.Id_actorAddress;
-}
-
-bool VarDecl::isDistributedActorTransportName(ASTContext &ctx, DeclName name) {
-  assert(name.getArgumentNames().size() == 0);
-  return name.getBaseName() == ctx.Id_transport ||
-    name.getBaseName() == ctx.Id_actorTransport;
-}
-
 ConstructorDecl::ConstructorDecl(DeclName Name, SourceLoc ConstructorLoc,
                                  bool Failable, SourceLoc FailabilityLoc,
                                  bool Async, SourceLoc AsyncLoc,
@@ -7899,6 +7888,7 @@ bool ConstructorDecl::isDistributedActorLocalInit() const {
   return params->get(0)->getInterfaceType()->isEqual(transportType);
 }
 
+// TODO: remove resolve init in favor of resolve function?
 bool ConstructorDecl::isDistributedActorResolveInit() const {
   auto name = getName();
   auto argumentNames = name.getArgumentNames();
@@ -7912,12 +7902,10 @@ bool ConstructorDecl::isDistributedActorResolveInit() const {
     return false;
 
   auto *params = getParameters();
-  assert(params->size() == 2);
-
-  auto addressType = C.getActorAddressDecl()->getDeclaredInterfaceType();
+  auto identityType = C.getAnyActorIdentityDecl()->getDeclaredInterfaceType();
   auto transportType = C.getActorTransportDecl()->getDeclaredInterfaceType();
 
-  return params->get(0)->getInterfaceType()->isEqual(addressType) &&
+  return params->get(0)->getInterfaceType()->isEqual(identityType) &&
          params->get(1)->getInterfaceType()->isEqual(transportType);
 }
 

lib/AST/TypeCheckRequests.cpp

@@ -1036,7 +1036,7 @@ void swift::simple_display(llvm::raw_ostream &out,
   case ImplicitMemberAction::ResolveDistributedActor:
     out << "resolve DistributedActor[init(transport:), init(resolve:using:)]";
     break;
-  case ImplicitMemberAction::ResolveDistributedActorAddress:
+  case ImplicitMemberAction::idResolveDistributedActorIdentity:
     out << "resolve DistributedActor[actorAddress]";
     break;
   }

lib/SILGen/SILGenDestructor.cpp

@@ -125,14 +125,14 @@ void SILGenFunction::injectDistributedActorDestructorLifecycleCall(
   auto selfManagedValue = ManagedValue::forUnmanaged(selfValue);
   auto selfType = selfDecl->getType();
 
-  // ==== locate: self.actorAddress
-  auto addressVarDeclRefs = cd->lookupDirect(ctx.Id_actorAddress);
-  assert(addressVarDeclRefs.size() == 1);
-  auto *addressVarDeclRef = dyn_cast<VarDecl>(addressVarDeclRefs.front());
-  assert(addressVarDeclRef);
-  auto addressRef =
-      B.createRefElementAddr(Loc, selfValue, addressVarDeclRef,
-                             getLoweredType(addressVarDeclRef->getType()));
+  // ==== locate: self.id
+  auto idVarDeclRefs = cd->lookupDirect(ctx.Id_id);
+  assert(idVarDeclRefs.size() == 1);
+  auto *idVarDeclRef = dyn_cast<VarDecl>(idVarDeclRefs.front());
+  assert(idVarDeclRef);
+  auto idRef =
+      B.createRefElementAddr(Loc, selfValue, idVarDeclRef,
+                             getLoweredType(idVarDeclRef->getType()));
 
   // ==== locate: self.actorTransport
   auto transportVarDeclRefs = cd->lookupDirect(ctx.Id_actorTransport);
@@ -142,15 +142,15 @@ void SILGenFunction::injectDistributedActorDestructorLifecycleCall(
       B.createRefElementAddr(Loc, selfValue, transportVarDeclRef,
                              getLoweredType(transportVarDeclRef->getType()));
 
-  // locate: self.transport.resignAddress(...)
+  // locate: self.transport.resignIdentity(...)
   auto *transportDecl = ctx.getActorTransportDecl();
-  auto resignFnDecls = transportDecl->lookupDirect(ctx.Id_resignAddress);
+  auto resignFnDecls = transportDecl->lookupDirect(ctx.Id_resignIdentity);
   assert(resignFnDecls.size() == 1);
   auto *resignFnDecl = resignFnDecls.front();
   auto resignFnRef = SILDeclRef(resignFnDecl);
 
-  // we only transport.resignAddress if we are a local actor,
-  // and thus the address was created by transport.assignAddress.
+  // we only transport.resignIdentity if we are a local actor,
+  // and thus the address was created by transport.assignIdentity.
   auto isRemoteBB = createBasicBlock();
   auto isLocalBB = createBasicBlock();
 
@@ -187,7 +187,7 @@ void SILGenFunction::injectDistributedActorDestructorLifecycleCall(
   }
 
   // if local
-  // === self.transport.resignAddress(self.address)
+  // === self.transport.resignIdentity(self.address)
   {
     B.emitBlock(isLocalBB);
 
@@ -208,7 +208,7 @@ void SILGenFunction::injectDistributedActorDestructorLifecycleCall(
         transportDecl, openedTransport, ProtocolConformanceRef(transportDecl));
 
     SmallVector<SILValue, 2> params;
-    params.push_back(addressRef);
+    params.push_back(idRef);
     params.push_back(transportAddr); // self for the call, as last param
 
     B.createApply(Loc, witness, subs, params);

lib/Sema/CodeSynthesis.cpp

@@ -1288,7 +1288,7 @@ ResolveImplicitMemberRequest::evaluate(Evaluator &evaluator,
   }
     break;
   case ImplicitMemberAction::ResolveDistributedActor:
-  case ImplicitMemberAction::ResolveDistributedActorAddress: {
+  case ImplicitMemberAction::idResolveDistributedActorIdentity: {
     // init(transport:) and init(resolve:using:) may be synthesized as part of
     // derived conformance to the DistributedActor protocol.
     // If the target should conform to the DistributedActor protocol, check the