fix deinit sil test

Author: ktoso

include/swift/AST/Decl.h

@@ -3312,7 +3312,6 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   /// Find, or potentially synthesize, the implicit 'id' property of this actor.
   ValueDecl *getDistributedActorIDProperty() const;
 
-
   /// Collect the set of protocols to which this type should implicitly
   /// conform, such as AnyObject (for classes).
   void getImplicitProtocols(SmallVectorImpl<ProtocolDecl *> &protocols);

include/swift/AST/KnownIdentifiers.def

@@ -268,8 +268,6 @@ IDENTIFIER(resolve)
 IDENTIFIER(system)
 IDENTIFIER(ID)
 IDENTIFIER(id)
-//IDENTIFIER(identity) // TODO(distributed): remove
-//IDENTIFIER(identifier)
 IDENTIFIER(Invocation)
 IDENTIFIER(_distributedActorRemoteInitialize)
 IDENTIFIER(_distributedActorDestroy)

lib/SIL/Verifier/SILVerifier.cpp

@@ -872,8 +872,8 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
 
   /// Assert that two types are equal.
   void requireSameType(SILType type1, SILType type2, const Twine &complaint) {
-    _require(type1 == type2, complaint, // FIXME(distributed): REMOVE THIS !!!!! fprintf(stderr, "[
-             [&] { llvm::dbgs() << "       got: " << type1 << "\n  expected: " << type2 << '\n'; });
+    _require(type1 == type2, complaint,
+             [&] { llvm::dbgs() << "  " << type1 << "\n  " << type2 << '\n'; });
   }
 
   /// Require two function types to be ABI-compatible.

lib/SILGen/SILGenDistributed.cpp

@@ -126,7 +126,7 @@ static void emitDistributedIfRemoteBranch(SILGenFunction &SGF,
 // MARK: local instance initialization
 
 /// For the initialization of a local distributed actor instance, emits code to initialize the instance's
-/// stored property corresponding to the transport.
+/// stored property corresponding to the system.
 static void emitTransportInit(SILGenFunction &SGF,
                                         ConstructorDecl *ctor,
                                         SILLocation loc,
@@ -148,7 +148,7 @@ static void emitTransportInit(SILGenFunction &SGF,
 ///
 /// Specifically, it performs:
 /// \verbatim
-///     self.id = transport.assignID(Self.self)
+///     self.id = system.assignID(Self.self)
 /// \endverbatim
 static void emitIdentityInit(SILGenFunction &SGF, ConstructorDecl *ctor,
                              SILLocation loc, ManagedValue borrowedSelfArg) {
@@ -259,7 +259,7 @@ static void createDistributedActorFactory_resolve(
   auto loc = SILLocation(fd);
   loc.markAutoGenerated();
 
-  // // ---- actually call transport.resolve(id: id, as: Self.self)
+  // // ---- actually call system.resolve(id: id, as: Self.self)
   emitDistributedActorSystemWitnessCall(
       B, loc, C.Id_resolve, actorSystemValue, SGF.getLoweredType(selfTy),
       {idValue, selfMetatypeValue },
@@ -316,7 +316,7 @@ void SILGenFunction::emitDistributedActorFactory(FuncDecl *fd) { // TODO(distrib
 
   auto optionalReturnTy = SILType::getOptionalType(returnTy);
 
-  // ==== Call `try transport.resolve(id: id, as: Self.self)`
+  // ==== Call `try system.resolve(id: id, as: Self.self)`
   {
     createDistributedActorFactory_resolve(
         *this, C, fd, idArg, actorSystemArg, selfTy, selfMetatypeValue,
@@ -399,7 +399,7 @@ void SILGenFunction::emitDistributedActorFactory(FuncDecl *fd) { // TODO(distrib
   }
 }
 
-// MARK: transport.resignID()
+// MARK: system.resignID()
 
 void SILGenFunction::emitResignIDCall(SILLocation loc,
                                             ClassDecl *actorDecl,
@@ -435,8 +435,8 @@ SILGenFunction::emitConditionalResignIdentityCall(SILLocation loc,
 
   auto selfTy = actorDecl->getDeclaredInterfaceType();
 
-  // we only transport.resignID if we are a local actor,
-  // and thus the address was created by transport.assignID.
+  // we only system.resignID if we are a local actor,
+  // and thus the address was created by system.assignID.
   auto isRemoteBB = createBasicBlock();
   auto isLocalBB = createBasicBlock();
 

lib/SILGen/SILGenFunction.h

@@ -2033,7 +2033,7 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   /// Specifically, this code emits SIL that performs the call
   ///
   /// \verbatim
-  ///   self.transport.resignID(self.id)
+  ///   self.system.resignID(self.id)
   /// \endverbatim
   ///
   /// using the current builder's state as the injection point.

stdlib/public/Distributed/DistributedActorSystem.swift

@@ -62,7 +62,7 @@ public protocol DistributedActorSystem: Sendable {
   ///
   /// The address MUST uniquely identify the actor, and allow resolving it.
   /// E.g. if an actor is created under address `addr1` then immediately invoking
-  /// `transport.resolve(id: addr1, as: Greeter.self)` MUST return a reference
+  /// `system.resolve(id: addr1, as: Greeter.self)` MUST return a reference
   /// to the same actor.
   func assignID<Act>(_ actorType: Act.Type) -> ActorID
       where Act: DistributedActor,
@@ -280,7 +280,7 @@ public struct RemoteCallTarget {
 ///
 /// ## Decoding an invocation
 /// Since every actor system is going to deal with a concrete invocation type, they may
-/// implement decoding them whichever way is most optimal for the given transport.
+/// implement decoding them whichever way is most optimal for the given system.
 ///
 /// Once decided, the invocation must be passed to `executeDistributedTarget`
 /// which will decode the substitutions, argument values, return and error types (in that order).

test/Distributed/Inputs/FakeDistributedActorSystems.swift

@@ -40,6 +40,12 @@ public struct FakeActorSystem: DistributedActorSystem {
   public typealias Invocation = FakeInvocation
   public typealias SerializationRequirement = Codable
 
+  // just so that the struct does not get optimized away entirely
+  let someValue: String = ""
+  let someValue2: String = ""
+  let someValue3: String = ""
+  let someValue4: String = ""
+
   init() {
     print("Initialized new FakeActorSystem")
   }

test/Distributed/SIL/distributed_actor_default_deinit_sil.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -disable-availability-checking %S/../Inputs/FakeDistributedActorSystems.swift
-// RUN: %target-swift-frontend -module-name default_deinit -primary-file %s -emit-sil -enable-experimental-distributed -disable-availability-checking -I %t | %FileCheck %s --enable-var-scope --dump-input=always
+// RUN: %target-swift-frontend -module-name default_deinit -primary-file %s -emit-sil -enable-experimental-distributed -disable-availability-checking -I %t | %FileCheck %s --enable-var-scope --color
 // REQUIRES: concurrency
 // REQUIRES: distributed
 
@@ -9,7 +9,7 @@ import FakeDistributedActorSystems
 
 typealias DefaultDistributedActorSystem = FakeActorSystem
 
-class SomeClass {}
+final class SomeClass: Sendable {}
 
 distributed actor MyDistActor {
   let localOnlyField: SomeClass
@@ -39,7 +39,7 @@ distributed actor MyDistActor {
 // CHECK:   [[SYS_REF:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.actorSystem
 // CHECK:   [[ID_LOAD:%[0-9]+]] = load [[ID_REF]] : $*ActorAddress
 // CHECK:   [[SYS_LOAD:%[0-9]+]] = load [[SYS_REF]] : $*FakeActorSystem
-// CHECK:   [[RESIGN:%[0-9]+]] = function_ref @$s16FakeDistributedActorSystems0aB6SystemV8resignIDyyAA0B7AddressVF : $@convention(method) (@guaranteed ActorAddress, FakeActorSystem) -> ()
+// CHECK:   [[RESIGN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0aC6SystemV8resignIDyyAA0C7AddressVF : $@convention(method) (@guaranteed ActorAddress, @guaranteed FakeActorSystem) -> ()
 // CHECK:   apply [[RESIGN]]([[ID_LOAD]], [[SYS_LOAD]])
 // CHECK:   br [[CONTINUE:bb[0-9]+]]