remove restrictions on dist-actor init parameters

we will no longer require exactly one ActorSystem-conforming parameter.

Author: kavon

include/swift/AST/DiagnosticsSema.def

@@ -4777,14 +4777,6 @@ ERROR(distributed_actor_func_static,none,
 ERROR(distributed_actor_func_not_in_distributed_actor,none,
       "'distributed' method can only be declared within 'distributed actor'",
       ())
-ERROR(distributed_actor_designated_ctor_must_have_one_distributedactorsystem_param,none,
-      "designated distributed actor initializer %0 must accept exactly one "
-      "DistributedActorSystem parameter, found %1",
-      (DeclName, int))
-ERROR(distributed_actor_designated_ctor_missing_transport_param,none,
-      "designated distributed actor initializer %0 is missing required "
-      "DistributedActorSystem parameter",
-      (DeclName))
 ERROR(distributed_actor_user_defined_special_property,none,
       "property %0 cannot be defined explicitly, as it conflicts with "
       "distributed actor synthesized stored property",

lib/Sema/TypeCheckDistributed.cpp

@@ -595,47 +595,6 @@ void swift::checkDistributedActorProperties(const NominalTypeDecl *decl) {
   }
 }
 
-void swift::checkDistributedActorConstructor(const ClassDecl *decl, ConstructorDecl *ctor) {
-  // bail out unless distributed actor, only those have special rules to check here
-  if (!decl->isDistributedActor())
-    return;
-
-  // Only designated initializers need extra checks
-  if (!ctor->isDesignatedInit())
-    return;
-
-  // === Designated initializers must accept exactly one actor transport that
-  // matches the actor transport type of the actor.
-  SmallVector<ParamDecl*, 2> transportParams;
-  int transportParamsCount = 0;
-  Type actorSystemTy = ctor->mapTypeIntoContext(
-      getDistributedActorSystemType(const_cast<ClassDecl *>(decl)));
-  for (auto param : *ctor->getParameters()) {
-    auto paramTy = ctor->mapTypeIntoContext(param->getInterfaceType());
-    if (paramTy->isEqual(actorSystemTy)) {
-      transportParamsCount += 1;
-      transportParams.push_back(param);
-    }
-  }
-
-  // missing transport parameter
-  if (transportParamsCount == 0) {
-    ctor->diagnose(diag::distributed_actor_designated_ctor_missing_transport_param,
-                   ctor->getName());
-    // TODO(distributed): offer fixit to insert 'system: DistributedActorSystem'
-    return;
-  }
-
-  // ok! We found exactly one transport parameter
-  if (transportParamsCount == 1)
-    return;
-
-  // 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_distributedactorsystem_param,
-                 ctor->getName(), transportParamsCount);
-}
-
 // ==== ------------------------------------------------------------------------
 
 void TypeChecker::checkDistributedActor(SourceFile *SF, NominalTypeDecl *nominal) {
@@ -653,14 +612,6 @@ void TypeChecker::checkDistributedActor(SourceFile *SF, NominalTypeDecl *nominal
   (void)nominal->getDefaultInitializer();
 
   for (auto member : nominal->getMembers()) {
-    // --- Check all constructors
-    if (auto ctor = dyn_cast<ConstructorDecl>(member)) {
-      if (auto classDecl = dyn_cast<ClassDecl>(nominal)) {
-        checkDistributedActorConstructor(classDecl, ctor);
-        continue;
-      }
-    }
-
     // --- Ensure all thunks
     if (auto func = dyn_cast<AbstractFunctionDecl>(member)) {
       if (!func->isDistributed())

lib/Sema/TypeCheckDistributed.h

@@ -40,9 +40,6 @@ bool ensureDistributedModuleLoaded(Decl *decl);
 /// Check for illegal property declarations (e.g. re-declaring transport or id)
 void checkDistributedActorProperties(const NominalTypeDecl *decl);
 
-/// The local and resolve distributed actor constructors have special rules to check.
-void checkDistributedActorConstructor(const ClassDecl *decl, ConstructorDecl *ctor);
-
 /// Type-check additional ad-hoc protocol requirements.
 /// Ad-hoc requirements are protocol requirements currently not expressible
 /// in the Swift type-system.

test/Distributed/distributed_actor_initialization.swift

@@ -19,37 +19,33 @@ distributed actor OK1 {
   // ok, since all fields are initialized, the constructor can be synthesized
 }
 
-// TODO(distributed): test all the FIXITs in this file
+distributed actor OK2 {
+  var x: Int
 
-distributed actor Bad1 {
-  init() {
-    // expected-error@-1 {{designated distributed actor initializer 'init()' is missing required DistributedActorSystem parameter}}
+  init(x: Int, system: FakeActorSystem) { // ok
+    self.x = x
   }
 }
 
-distributed actor Bad12 {
-  init(x: String) {
-    // expected-error@-1 {{designated distributed actor initializer 'init(x:)' is missing required DistributedActorSystem parameter}}
-  }
+// NOTE: keep in mind this is only through typechecking, so no explicit
+// actorSystem is being assigned here.
+distributed actor OK3 {
+  init() {}
 }
 
-distributed actor OK2 {
-  var x: Int
-
-  init(x: Int, system: FakeActorSystem) { // ok
-    self.x = x
+distributed actor OK4 {
+  init(x: String) {
   }
 }
 
-distributed actor Bad2 {
+distributed actor OK5 {
   var x: Int = 1
 
   init(system: FakeActorSystem, too many: FakeActorSystem) {
-    // expected-error@-1{{designated distributed actor initializer 'init(system:too:)' must accept exactly one DistributedActorSystem parameter, found 2}}
   }
 }
 
-distributed actor OK3 {
+distributed actor OK6 {
   var x: Int
 
   init(y: Int, system: FakeActorSystem) {