Replace destoryDistributedActor builtin with destroyDefaultActor

kavon · kavon · commit 006e2b446bae · 2021-10-21T19:41:31.000-07:00
Currently, they both end up doing the exact same thing, so there's
no need for both.
diff --git a/include/swift/AST/Builtins.def b/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)
diff --git a/include/swift/Runtime/Concurrency.h b/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
diff --git a/include/swift/Runtime/RuntimeFunctions.def b/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,
diff --git a/lib/AST/Builtins.cpp b/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);
diff --git a/lib/IRGen/GenBuiltin.cpp b/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;
diff --git a/lib/IRGen/GenDistributed.cpp b/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();
-}
diff --git a/lib/IRGen/GenDistributed.h b/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
 
diff --git a/lib/SIL/IR/OperandOwnership.cpp b/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)
diff --git a/lib/SIL/IR/ValueOwnership.cpp b/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)
diff --git a/lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp b/lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp
@@ -2397,18 +2397,6 @@ static void emitDefaultActorDestroy(SILBuilder &B, SILLocation loc,
   B.createEndBorrow(loc, self);
 }
 
-static void emitDistributedActorDestroy(SILBuilder &B, SILLocation loc,
-                                        SILValue self) {
-  auto builtinName = B.getASTContext().getIdentifier(
-    getBuiltinName(BuiltinValueKind::DestroyDistributedActor));
-  auto resultTy = B.getModule().Types.getEmptyTupleType();
-
-  self = B.createBeginBorrow(loc, self);
-  B.createBuiltin(loc, builtinName, resultTy, /*subs*/{},
-                  { self });
-  B.createEndBorrow(loc, self);
-}
-
 void LifetimeChecker::processUninitializedRelease(SILInstruction *Release,
                                                   bool consumed,
                                              SILBasicBlock::iterator InsertPt) {
@@ -2465,9 +2453,6 @@ void LifetimeChecker::processUninitializedRelease(SILInstruction *Release,
     if (!TheMemory.isDelegatingInit()) {
       auto classDecl = TheMemory.getASTType().getClassOrBoundGenericClass();
       if (classDecl && classDecl->isRootDefaultActor()) {
-        if (classDecl->isDistributedActor())
-          emitDistributedActorDestroy(B, Loc, Pointer); // FIXME(distributed): this will be different only for if it is 'remote'
-        else
           emitDefaultActorDestroy(B, Loc, Pointer);
       }
     }
diff --git a/lib/SILOptimizer/Transforms/AccessEnforcementReleaseSinking.cpp b/lib/SILOptimizer/Transforms/AccessEnforcementReleaseSinking.cpp
@@ -182,7 +182,6 @@ static bool isBarrier(SILInstruction *inst) {
     case BuiltinValueKind::InitializeDefaultActor:
     case BuiltinValueKind::DestroyDefaultActor:
     case BuiltinValueKind::InitializeDistributedRemoteActor:
-    case BuiltinValueKind::DestroyDistributedActor:
     case BuiltinValueKind::BuildOrdinarySerialExecutorRef:
     case BuiltinValueKind::BuildDefaultActorExecutorRef:
     case BuiltinValueKind::BuildMainActorExecutorRef:
diff --git a/stdlib/public/Concurrency/Actor.cpp b/stdlib/public/Concurrency/Actor.cpp
@@ -1981,11 +1981,6 @@ swift::swift_distributedActor_remote_initialize(const Metadata *actorType) {
   return reinterpret_cast<OpaqueValue*>(actor);
 }
 
-void swift::swift_distributedActor_destroy(DefaultActor *_actor) {
-  // FIXME(distributed): if this is a proxy, we would destroy a bit differently I guess? less memory was allocated etc.
-  asImpl(_actor)->destroy(); // today we just replicate what defaultActor_destroy does
-}
-
 bool swift::swift_distributed_actor_is_remote(DefaultActor *_actor) {
   return asImpl(_actor)->isDistributedRemote();
 }
diff --git a/stdlib/public/Distributed/DistributedActor.swift b/stdlib/public/Distributed/DistributedActor.swift
@@ -243,10 +243,3 @@ func __isLocalActor(_ actor: AnyObject) -> Bool {
 
 @_silgen_name("swift_distributedActor_remote_initialize")
 func _distributedActorRemoteInitialize(_ actorType: Builtin.RawPointer) -> Any
-
-/// Called to destroy the default actor instance in an actor.
-/// The implementation will call this within the actor's deinit.
-///
-/// This will call `actorTransport.resignIdentity(self.id)`.
-@_silgen_name("swift_distributedActor_destroy")
-func _distributedActorDestroy(_ actor: AnyObject)
