[Distributed] Harden distributed_actor_deinit.swift

Author: ktoso

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -2941,10 +2941,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     checkExplicitAvailability(ED);
 
-    if (nominal->isDistributedActor()) {
-      auto decl = dyn_cast<ClassDecl>(nominal);
-      TypeChecker::checkDistributedActor(decl);
-    }
+    if (nominal->isDistributedActor())
+      TypeChecker::checkDistributedActor(dyn_cast<ClassDecl>(nominal));
   }
 
   void visitTopLevelCodeDecl(TopLevelCodeDecl *TLCD) {

test/Distributed/Runtime/distributed_actor_deinit.swift

@@ -66,7 +66,10 @@ struct ActorAddress: ActorIdentity {
 }
 
 @available(SwiftStdlib 5.5, *)
-struct FakeTransport: ActorTransport {
+final class FakeTransport: @unchecked Sendable, ActorTransport {
+
+  var n = 0
+
   func decodeIdentity(from decoder: Decoder) throws -> AnyActorIdentity {
     print("decode identity from:\(decoder)")
     fatalError("not implemented \(#function)")
@@ -80,7 +83,8 @@ struct FakeTransport: ActorTransport {
 
   func assignIdentity<Act>(_ actorType: Act.Type) -> AnyActorIdentity
       where Act: DistributedActor {
-    let address = ActorAddress(parse: "xxx")
+    n += 1
+    let address = ActorAddress(parse: "addr-\(n)")
     print("assign type:\(actorType), address:\(address)")
     return .init(address)
   }
@@ -99,7 +103,6 @@ struct FakeTransport: ActorTransport {
 @available(SwiftStdlib 5.5, *)
 func test() {
   let transport = FakeTransport()
-  let address = ActorAddress(parse: "xxx")
 
   // no lifecycle things make sense for a normal actor, double check we didn't emit them
   print("before A")
@@ -108,35 +111,44 @@ func test() {
   // CHECK: before A
   // CHECK: after A
 
-  _ = DA(transport: transport)
+  _ = { () -> DA in
+    DA(transport: transport)
+  }()
   // CHECK: assign type:DA, address:[[ADDRESS:.*]]
-  // CHECK: ready actor:main.DA, address:AnyActorIdentity(ActorAddress(address: "xxx"))
-  // CHECK: resign address:AnyActorIdentity(ActorAddress(address: "xxx"))
+  // CHECK: ready actor:main.DA, address:AnyActorIdentity(ActorAddress(address: "[[ADDR1:addr-[0-9]]]"))
+  // CHECK: resign address:AnyActorIdentity(ActorAddress(address: "[[ADDR1]]"))
 
-  _ = DA_userDefined(transport: transport)
+  _ = { () -> DA_userDefined in
+    DA_userDefined(transport: transport)
+  }()
   // CHECK: assign type:DA_userDefined, address:[[ADDRESS:.*]]
-  // CHECK: ready actor:main.DA_userDefined, address:AnyActorIdentity(ActorAddress(address: "xxx"))
-  // CHECK: resign address:AnyActorIdentity(ActorAddress(address: "xxx"))
+  // CHECK: ready actor:main.DA_userDefined, address:AnyActorIdentity(ActorAddress(address: "[[ADDR2:addr-[0-9]]]"))
+  // CHECK: resign address:AnyActorIdentity(ActorAddress(address: "[[ADDR2]]"))
 
   // resign must happen as the _last thing_ after user-deinit completed
-  _ = DA_userDefined2(transport: transport)
+  _ = { () -> DA_userDefined2 in
+    DA_userDefined2(transport: transport)
+  }()
   // CHECK: assign type:DA_userDefined2, address:[[ADDRESS:.*]]
-  // CHECK: ready actor:main.DA_userDefined2, address:AnyActorIdentity(ActorAddress(address: "xxx"))
-  // CHECK: Deinitializing AnyActorIdentity(ActorAddress(address: "xxx"))
-  // CHECK-NEXT: resign address:AnyActorIdentity(ActorAddress(address: "xxx"))
+  // CHECK: ready actor:main.DA_userDefined2, address:AnyActorIdentity(ActorAddress(address: "[[ADDR3:addr-[0-9]]]"))
+  // CHECK: Deinitializing AnyActorIdentity(ActorAddress(address: "[[ADDR3]]"))
+  // CHECK-NEXT: resign address:AnyActorIdentity(ActorAddress(address: "[[ADDR3]]"))
 
   // resign must happen as the _last thing_ after user-deinit completed
-  _ = DA_state(transport: transport)
+  _ = { () -> DA_state in
+    DA_state(transport: transport)
+  }()
   // CHECK: assign type:DA_state, address:[[ADDRESS:.*]]
-  // CHECK: ready actor:main.DA_state, address:AnyActorIdentity(ActorAddress(address: "xxx"))
-  // CHECK: Deinitializing AnyActorIdentity(ActorAddress(address: "xxx"))
-  // CHECK-NEXT: resign address:AnyActorIdentity(ActorAddress(address: "xxx"))
+  // CHECK: ready actor:main.DA_state, address:AnyActorIdentity(ActorAddress(address: "[[ADDR4:addr-[0-9]]]"))
+  // CHECK: Deinitializing AnyActorIdentity(ActorAddress(address: "[[ADDR4]]"))
+  // CHECK-NEXT: resign address:AnyActorIdentity(ActorAddress(address: "[[ADDR4]]"))
 
   // a remote actor should not resign it's address, it was never "assigned" it
-  print("before")
-  _ = try! DA_userDefined2.resolve(.init(address), using: transport)
-  // CHECK: before
-  // CHECK-NEXT: resolve type:DA_userDefined2, address:AnyActorIdentity(ActorAddress(address: "xxx"))
+  let address = ActorAddress(parse: "remote-1")
+  _ = { () -> DA_userDefined2 in
+    try! DA_userDefined2.resolve(.init(address), using: transport)
+  }()
+  // CHECK-NEXT: resolve type:DA_userDefined2, address:AnyActorIdentity(ActorAddress(address: "[[ADDR5:remote-1]]"))
   // CHECK-NEXT: Deinitializing
 }