[Distributed] Review followup and cleanups

Author: ktoso

lib/IRGen/GenDistributed.cpp

@@ -31,8 +31,6 @@
 using namespace swift;
 using namespace irgen;
 
-namespace {} // end anonymous namespace
-
 llvm::Value *irgen::emitDistributedActorInitializeRemote(
     IRGenFunction &IGF, llvm::Value *actorMetatype, Explosion &out) {
   auto fn = IGF.IGM.getDistributedActorInitializeRemoteFn();

lib/SILGen/SILGenDistributed.cpp

@@ -445,8 +445,6 @@ void SILGenFunction::emitDistributedActorReady(
 
   // --- prepare conformance subs
   auto genericSig = actorReadyMethod->getGenericSignature();
-  fprintf(stderr, "[%s:%d] (%s) GENERIC SIG\n", __FILE__, __LINE__, __FUNCTION__);
-  genericSig->dump();
 
   SubstitutionMap subs =
       SubstitutionMap::get(genericSig,
@@ -478,9 +476,6 @@ void SILGenFunction::emitDistributedActorFactory(FuncDecl *fd) {
   auto &C = getASTContext();
   SILLocation loc = fd;
 
-  fd->dump();
-  F.dump();
-
   // ==== Prepare argument references
   // --- Parameter: identity
   SILArgument *identityArg = F.getArgument(0);
@@ -535,15 +530,11 @@ void SILGenFunction::emitDistributedActorFactory(FuncDecl *fd) {
     // type: SpecificDistributedActor
     auto returnTy = getLoweredType(
         F.mapTypeIntoContext(selfTyDecl->getDeclaredInterfaceType()));
-    fprintf(stderr, "[%s:%d] (%s) auto returnTy = selfArg.getType().getDeclaredInterfaceType();\n", __FILE__, __LINE__, __FUNCTION__);
-    returnTy.dump();
 
     // type: SpecificDistributedActor.Type
     auto selfMetatype =
         getLoweredType(F.mapTypeIntoContext(selfArg.getType().getASTType()));
     SILValue selfMetatypeValue = B.createMetatype(loc, selfMetatype);
-    fprintf(stderr, "[%s:%d] (%s)     SILValue selfMetatypeValue = B.createMetatype(loc, selfMetatype);\n", __FILE__, __LINE__, __FUNCTION__);
-    selfMetatypeValue->dump();
 
     // --- get the uninitialized allocation from the runtime system.
     FullExpr scope(Cleanups, CleanupLocation(fd));
@@ -595,9 +586,6 @@ void SILGenFunction::emitDistributedActorFactory(FuncDecl *fd) {
 //      B.createThrow(loc, error);
 //    }
   }
-
-  fprintf(stderr, "[%s:%d] (%s) DONE HERE\n", __FILE__, __LINE__, __FUNCTION__);
-  F.dump();
 }
 
 /******************************************************************************/

lib/SILGen/SILGenFunction.cpp

@@ -547,12 +547,6 @@ void SILGenFunction::emitFunction(FuncDecl *fd) {
   emitEpilog(fd);
 
   mergeCleanupBlocks();
-
-  if (fd->isDistributedActorFactory()) {
-    fprintf(stderr, "[%s:%d] (%s) DONEDONEDONEDONEDONEDONEDONEDONEDONEDONEDONEDONE\n", __FILE__, __LINE__, __FUNCTION__);
-    F.dump();
-    fprintf(stderr, "[%s:%d] (%s) DONEDONEDONEDONEDONEDONEDONEDONEDONEDONEDONEDONE\n", __FILE__, __LINE__, __FUNCTION__);
-  }
 }
 
 void SILGenFunction::emitClosure(AbstractClosureExpr *ace) {

lib/Sema/TypeCheckAvailability.cpp

@@ -1684,8 +1684,6 @@ static void diagnosePotentialConcurrencyUnavailability(
   fixAvailability(ReferenceRange, ReferenceDC, RequiredRange, Context);
 }
 
-// TODO(concurrency): implement checkDistributedAvailability
-
 void TypeChecker::checkConcurrencyAvailability(SourceRange ReferenceRange,
                                                const DeclContext *ReferenceDC) {
   // Check the availability of concurrency runtime support.

lib/Sema/TypeCheckConcurrency.cpp

@@ -2514,14 +2514,7 @@ void swift::checkFunctionActorIsolation(AbstractFunctionDecl *decl) {
   }
 }
 
-/// Some actor constructors are special, so we need to check rules about them.
-void swift::checkActorConstructor(ClassDecl *decl, ConstructorDecl *ctor) {
-  if (decl->isDistributedActor())
-    checkDistributedActorConstructor(decl, ctor);
-}
-
 void swift::checkInitializerActorIsolation(Initializer *init, Expr *expr) {
-
   ActorIsolationChecker checker(init);
   expr->walk(checker);
 }

lib/Sema/TypeCheckConcurrency.h

@@ -54,7 +54,6 @@ void addAsyncNotes(AbstractFunctionDecl const* func);
 /// Check actor isolation rules.
 void checkTopLevelActorIsolation(TopLevelCodeDecl *decl);
 void checkFunctionActorIsolation(AbstractFunctionDecl *decl);
-void checkActorConstructor(ClassDecl *decl, ConstructorDecl *ctor);
 void checkInitializerActorIsolation(Initializer *init, Expr *expr);
 void checkEnumElementActorIsolation(EnumElementDecl *element, Expr *expr);
 void checkPropertyWrapperActorIsolation(VarDecl *wrappedVar, Expr *expr);

lib/Sema/TypeCheckDistributed.cpp

@@ -207,7 +207,8 @@ void swift::checkDistributedActorConstructor(const ClassDecl *decl, ConstructorD
   if (transportParamsCount == 1)
     return;
 
-  // TODO(distributed): could list exact parameters
+  // TODO(distributed): rdar://81824959 report the error on the offending (2nd) matching parameter
+  //                    Or maybe we can issue a note about the other offending params?
   ctor->diagnose(diag::distributed_actor_designated_ctor_must_have_one_transport_param,
                  ctor->getName(), transportParamsCount);
 }
@@ -222,7 +223,7 @@ void TypeChecker::checkDistributedActor(ClassDecl *decl) {
 
   // ==== Constructors
   // --- Get the default initializer
-  // If applicable, this will the default 'init(transport:)' initializer
+  // If applicable, this will create the default 'init(transport:)' initializer
   (void)decl->getDefaultInitializer();
 
   // --- Check all constructors

lib/Sema/TypeCheckDistributed.h

@@ -1,4 +1,4 @@
-//===--- TypeCheckDistributed.h - Distributed -------------------*- C++ -*-===//
+//===-- TypeCheckDistributed.h - Distributed actor typechecking -*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -23,19 +23,10 @@
 
 namespace swift {
 
-class AbstractFunctionDecl;
-class ConstructorDecl;
-class ASTContext;
 class ClassDecl;
+class ConstructorDecl;
 class Decl;
-class DeclContext;
-class Expr;
 class FuncDecl;
-class Initializer;
-class PatternBindingDecl;
-class ProtocolConformance;
-class ValueDecl;
-
 
 /******************************************************************************/
 /********************* Distributed Actor Type Checking ************************/

stdlib/public/Concurrency/Actor.cpp

@@ -1751,7 +1751,7 @@ void swift::swift_defaultActor_deallocateResilient(HeapObject *actor) {
                       metadata->getInstanceAlignMask());
 }
 
-/// FIXME: only exists for the quick-and-dirtraKASASAasasy MainActor implementation.
+/// FIXME: only exists for the quick-and-dirty MainActor implementation.
 namespace swift {
   Metadata* MainActorMetadata = nullptr;
 }

stdlib/public/Distributed/DistributedActor.swift

@@ -48,7 +48,8 @@ public protocol DistributedActor:
     ///
     /// - Parameter identity: identity uniquely identifying a, potentially remote, actor in the system
     /// - Parameter transport: `transport` which should be used to resolve the `identity`, and be associated with the returned actor
-// FIXME: move to generic identity here; depends on
+// FIXME: Partially blocked on SE-309, because then we can store ActorIdentity directly
+//        We want to move to accepting a generic or existential identity here
 //    static func resolve<Identity>(_ identity: Identity, using transport: ActorTransport)
 //      throws -> Self where Identity: ActorIdentity
     static func resolve(_ identity: AnyActorIdentity, using transport: ActorTransport)

test/Distributed/Runtime/distributed_actor_isRemote.swift

@@ -96,8 +96,8 @@ func test_remote() async {
   assert(__isLocalActor(local) == true, "should be local")
   assert(__isRemoteActor(local) == false, "should be local")
   print("isRemote(local) = \(__isRemoteActor(local))") // CHECK: isRemote(local) = false
-  print("local.id = \(local.id)") // CHECK: local.id = AnyActorIdentity(ActorAddress(address: "sact://127.0.0.1/example#1234"))
-  print("local.transport = \(local.id)") // CHECK: local.transport = FakeTransport()
+  print("local.id = \(local.id)") // CHECK: local.id = AnyActorIdentity(ActorAddress(address: "xxx"))
+  print("local.transport = \(local.actorTransport)") // CHECK: local.transport = FakeTransport()
 
   // assume it always makes a remote one
   let remote = try! SomeSpecificDistributedActor.resolve(.init(address), using: transport)
@@ -110,7 +110,6 @@ func test_remote() async {
   print("remote.transport = \(remote.actorTransport)") // CHECK: remote.transport = FakeTransport()
 
   print("done") // CHECK: done
-  let xxx = remote
 }
 
 @available(SwiftStdlib 5.5, *)