Merge pull request #41740 from kavon/assign-actorSystem

[distributed] Require explicit assignment of `actorSystem`

Author: kavon

include/swift/AST/Attr.def

@@ -265,6 +265,10 @@ SIMPLE_DECL_ATTR(objcMembers, ObjCMembers,
   OnClass |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   34)
+CONTEXTUAL_SIMPLE_DECL_ATTR(_compilerInitialized, CompilerInitialized,
+  OnVar |
+  ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
+  35)
 CONTEXTUAL_SIMPLE_DECL_ATTR(__consuming, Consuming,
   OnFunc | OnAccessor |
   DeclModifier |

include/swift/AST/DiagnosticsSIL.def

@@ -211,6 +211,8 @@ ERROR(return_from_init_without_initing_stored_properties,none,
       "return from initializer without initializing all"
       " stored properties", ())
 
+ERROR(explicit_store_of_compilerinitialized,none,
+      "illegal assignment to '@_compilerInitialized' storage", ())
 ERROR(variable_function_use_uninit,none,
       "%select{variable|constant}1 '%0' used by function definition before"
       " being initialized",

include/swift/AST/DiagnosticsSema.def

@@ -3203,6 +3203,17 @@ ERROR(escaping_non_function_parameter,none,
 ERROR(escaping_optional_type_argument, none,
       "closure is already escaping in optional type argument", ())
 
+// @_compilerInitialized attribute
+ERROR(incompatible_compilerinitialized_var,none,
+      "'@_compilerInitialized' attribute only applies to "
+      "let-bound stored properties without a default value", ())
+ERROR(protocol_compilerinitialized,none,
+      "'@_compilerInitialized' is not currently supported in protocols", ())
+ERROR(optional_compilerinitialized,none,
+      "'@_compilerInitialized' cannot be applied to an Optional let", ())
+ERROR(instancemember_compilerinitialized,none,
+      "'@_compilerInitialized' can only be applied to a non-static class or actor member", ())
+
 // @_nonEphemeral attribute
 ERROR(non_ephemeral_non_pointer_type,none,
       "@_nonEphemeral attribute only applies to pointer types", ())
@@ -4777,14 +4788,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",

include/swift/SILOptimizer/Utils/DistributedActor.h

@@ -32,9 +32,12 @@ class SILLocation;
 class SILType;
 class SILValue;
 
-/// Finds the first `DistributedActorSystem`-compatible parameter of the given function.
-/// \returns nullptr if the function does not have such a parameter.
-SILArgument *findFirstDistributedActorSystemArg(SILFunction &F);
+/// Creates a reference to the distributed actor's \p actorSystem
+/// stored property.
+SILValue refDistributedActorSystem(SILBuilder &B,
+                                   SILLocation loc,
+                                   ClassDecl *actorDecl,
+                                   SILValue actorInstance);
 
 /// Emit a call to a witness of the DistributedActorSystem protocol.
 ///
@@ -59,6 +62,11 @@ void emitDistributedActorSystemWitnessCall(
 void emitActorReadyCall(SILBuilder &B, SILLocation loc, SILValue actor,
                         SILValue actorSystem);
 
+/// Emits code to notify the \p actorSystem that the given identity is resigned.
+void emitResignIdentityCall(SILBuilder &B, SILLocation loc, ClassDecl* actDecl,
+                            SILValue actor, SILValue identityRef);
+
+
 } // namespace swift
 
 #endif

lib/SILGen/InitializeDistActorIdentity.h

@@ -0,0 +1,40 @@
+//===--- InitializeDistActorIdentity.h - dist actor ID init for SILGen ----===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#include "Cleanup.h"
+
+namespace swift {
+
+class AllocStackInst;
+
+namespace Lowering {
+
+/// A clean-up designed to emit an initialization of a distributed actor's
+/// identity upon successful initialization of the actor's system.
+struct InitializeDistActorIdentity : Cleanup {
+private:
+  ConstructorDecl *ctor;
+  ManagedValue actorSelf;
+  VarDecl *systemVar;
+public:
+  InitializeDistActorIdentity(ConstructorDecl *ctor, ManagedValue actorSelf);
+
+  void emit(SILGenFunction &SGF, CleanupLocation loc,
+            ForUnwind_t forUnwind) override;
+
+  void dump(SILGenFunction &) const override;
+
+  VarDecl* getSystemVar() const { return systemVar; }
+};
+
+} // end Lowering namespace
+} // end swift namespace

lib/SILGen/SILGenConstructor.cpp

@@ -835,7 +835,7 @@ void SILGenFunction::emitClassConstructorInitializer(ConstructorDecl *ctor) {
     }
   }
 
-  // Distributed actor initializers implicitly initialize their transport and id
+  // Some distributed actor initializers need to init the actorSystem & id now
   if (isDesignatedDistActorInit) {
     emitDistributedActorImplicitPropertyInits(ctor, selfArg);
   }
@@ -1257,4 +1257,3 @@ void SILGenFunction::emitIVarInitializer(SILDeclRef ivarInitializer) {
 
   emitEpilog(loc);
 }
-