Merge pull request swiftlang#39762 from kavon/dactor-transport-lifecycle

[concurrency][distributed] Inject invocations of transport.actorReady in init

Author: kavon

include/swift/AST/Builtins.def

@@ -737,10 +737,6 @@ BUILTIN_MISC_OPERATION(DestroyDefaultActor, "destroyDefaultActor", "", Special)
 BUILTIN_MISC_OPERATION(InitializeDistributedRemoteActor,
                        "initializeDistributedRemoteActor", "", Special)
 
-/// Destroy the distributed-actor instance in a "proxy" actor object.
-BUILTIN_MISC_OPERATION(DestroyDistributedActor,
-                       "destroyDistributedActor", "", Special)
-
 /// Resume a non-throwing continuation normally with the given result.
 BUILTIN_MISC_OPERATION(ResumeNonThrowingContinuationReturning,
                        "resumeNonThrowingContinuationReturning", "", Special)

include/swift/Runtime/Concurrency.h

@@ -727,10 +727,6 @@ SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 OpaqueValue*
 swift_distributedActor_remote_initialize(const Metadata *actorType);
 
-/// Destroy the runtime storage for a default actor.
-SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-void swift_distributedActor_destroy(DefaultActor *actor);
-
 /// Enqueue a job on the default actor implementation.
 ///
 /// The job must be ready to run.  Notably, if it's a task, that

include/swift/Runtime/RuntimeFunctions.def

@@ -1725,14 +1725,6 @@ FUNCTION(DistributedActorInitializeRemote,
          ARGS(TypeMetadataPtrTy),
          ATTRS(NoUnwind))
 
-// void swift_distributedActor_destroy(DefaultActor *actor);
-FUNCTION(DistributedActorDestroy,
-         swift_distributedActor_destroy, SwiftCC,
-         ConcurrencyAvailability, // TODO(distributed): Introduce DistributedAvailability once shipping somewhere
-         RETURNS(VoidTy),
-         ARGS(RefCountedPtrTy),
-         ATTRS(NoUnwind))
-
 /// void swift_asyncLet_start(
 ///     AsyncLet *alet,
 ///     TaskOptionRecord *options,

include/swift/SILOptimizer/Utils/DistributedActor.h

@@ -0,0 +1,41 @@
+//===---- DistributedActor.h - SIL utils for distributed actors -*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2021 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_SILOPTIMIZER_UTILS_DISTRIBUTED_ACTOR_H
+#define SWIFT_SILOPTIMIZER_UTILS_DISTRIBUTED_ACTOR_H
+
+namespace swift {
+
+class ASTContext;
+class ConstructorDecl;
+class ClassDecl;
+class SILBuilder;
+class SILArgument;
+class SILFunction;
+class SILLocation;
+class SILValue;
+
+/// Finds the first `ActorTransport`-compatible parameter of the given function.
+/// \returns nullptr if the function does not have such a parameter.
+SILArgument *findFirstActorTransportArg(SILFunction &F);
+
+/// Emits code that notifies the distributed actor's transport that the
+/// actor is ready for execution.
+/// \param B the builder to use when emitting the code.
+/// \param actor the distributed actor instance to pass to the transport as
+/// being "ready" \param transport a value representing the ActorTransport
+void emitActorReadyCall(SILBuilder &B, SILLocation loc, SILValue actor,
+                        SILValue transport);
+
+} // namespace swift
+
+#endif

lib/AST/Builtins.cpp

@@ -1480,13 +1480,6 @@ static ValueDecl *getDistributedActorInitializeRemote(ASTContext &ctx,
                             _rawPointer);
 }
 
-static ValueDecl *getDistributedActorDestroy(ASTContext &ctx,
-                                                 Identifier id) {
-  return getBuiltinFunction(ctx, id, _thin,
-                            _parameters(_nativeObject),
-                            _void);
-}
-
 static ValueDecl *getResumeContinuationReturning(ASTContext &ctx,
                                                  Identifier id) {
   return getBuiltinFunction(ctx, id, _thin,
@@ -2842,9 +2835,6 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
   case BuiltinValueKind::InitializeDistributedRemoteActor:
     return getDistributedActorInitializeRemote(Context, Id);
 
-  case BuiltinValueKind::DestroyDistributedActor:
-    return getDistributedActorDestroy(Context, Id);
-
   case BuiltinValueKind::StartAsyncLet:
   case BuiltinValueKind::StartAsyncLetWithLocalBuffer:
     return getStartAsyncLet(Context, Id);

lib/IRGen/GenBuiltin.cpp

@@ -397,12 +397,6 @@ void irgen::emitBuiltinCall(IRGenFunction &IGF, const BuiltinInfo &Builtin,
     return;
   }
 
-  if (Builtin.ID == BuiltinValueKind::DestroyDistributedActor) {
-    auto actor = args.claimNext();
-    emitDistributedActorDestroy(IGF, actor);
-    return;
-  }
-
   // If this is an LLVM IR intrinsic, lower it to an intrinsic call.
   const IntrinsicInfo &IInfo = IGF.getSILModule().getIntrinsicInfo(FnId);
   llvm::Intrinsic::ID IID = IInfo.ID;

lib/IRGen/GenDistributed.cpp

@@ -53,13 +53,3 @@ llvm::Value *irgen::emitDistributedActorInitializeRemote(
 
   return result;
 }
-
-void irgen::emitDistributedActorDestroy(IRGenFunction &IGF,
-                                                 llvm::Value *actor) {
-  auto fn = IGF.IGM.getDistributedActorDestroyFn();
-  actor = IGF.Builder.CreateBitCast(actor, IGF.IGM.RefCountedPtrTy);
-
-  auto call = IGF.Builder.CreateCall(fn, {actor});
-  call->setCallingConv(IGF.IGM.SwiftCC);
-  call->setDoesNotThrow();
-}

lib/IRGen/GenDistributed.h

@@ -47,12 +47,6 @@ llvm::Value *emitDistributedActorInitializeRemote(
     llvm::Value *actorMetatype,
     Explosion &out);
 
-/// Destroy the distributed actor.
-/// E.g. a remote actor has to be destroyed differently from a local one.
-void emitDistributedActorDestroy(
-    IRGenFunction &IGF,
-    llvm::Value *actor);
-
 } // end namespace irgen
 } // end namespace swift
 

lib/SIL/IR/OperandOwnership.cpp

@@ -846,7 +846,6 @@ BUILTIN_OPERAND_OWNERSHIP(InteriorPointer, InitializeDefaultActor)
 BUILTIN_OPERAND_OWNERSHIP(InteriorPointer, DestroyDefaultActor)
 
 BUILTIN_OPERAND_OWNERSHIP(InteriorPointer, InitializeDistributedRemoteActor)
-BUILTIN_OPERAND_OWNERSHIP(InteriorPointer, DestroyDistributedActor)
 
 // FIXME: Why do these reqiuire a borrowed value at all?
 BUILTIN_OPERAND_OWNERSHIP(ForwardingBorrow, AutoDiffAllocateSubcontext)

lib/SIL/IR/ValueOwnership.cpp

@@ -538,7 +538,6 @@ CONSTANT_OWNERSHIP_BUILTIN(None, ConvertTaskToJob)
 CONSTANT_OWNERSHIP_BUILTIN(None, InitializeDefaultActor)
 CONSTANT_OWNERSHIP_BUILTIN(None, DestroyDefaultActor)
 CONSTANT_OWNERSHIP_BUILTIN(None, InitializeDistributedRemoteActor)
-CONSTANT_OWNERSHIP_BUILTIN(None, DestroyDistributedActor)
 CONSTANT_OWNERSHIP_BUILTIN(Owned, AutoDiffCreateLinearMapContext)
 CONSTANT_OWNERSHIP_BUILTIN(None, AutoDiffProjectTopLevelSubcontext)
 CONSTANT_OWNERSHIP_BUILTIN(None, AutoDiffAllocateSubcontext)