Merge pull request #76237 from swiftlang/revert-60057-mpokhylets/isolated-deinit

Revert "Isolated synchronous deinit"

Author: ahoppen

docs/ABI/Mangling.rst

@@ -365,7 +365,6 @@ Entities
   entity-spec ::= 'fP'                       // property wrapper backing initializer
   entity-spec ::= 'fW'                       // property wrapper init from projected value
   entity-spec ::= 'fD'                       // deallocating destructor; untyped
-  entity-spec ::= 'fZ'                       // isolated deallocating destructor; untyped
   entity-spec ::= 'fd'                       // non-deallocating destructor; untyped
   entity-spec ::= 'fE'                       // ivar destroyer; untyped
   entity-spec ::= 'fe'                       // ivar initializer; untyped

include/swift/ABI/Executor.h

@@ -295,7 +295,6 @@ using ThrowingTaskFutureWaitContinuationFunction =
   SWIFT_CC(swiftasync)
   void (SWIFT_ASYNC_CONTEXT AsyncContext *, SWIFT_CONTEXT void *);
 
-using DeinitWorkFunction = SWIFT_CC(swift) void(void *);
 
 template <class AsyncSignature>
 class AsyncFunctionPointer;

include/swift/ABI/MetadataValues.h

@@ -2490,8 +2490,7 @@ enum class JobKind : size_t {
   DefaultActorInline = First_Reserved,
   DefaultActorSeparate,
   DefaultActorOverride,
-  NullaryContinuation,
-  IsolatedDeinit,
+  NullaryContinuation
 };
 
 /// The priority of a job.  Higher priorities are larger values.

include/swift/AST/ASTMangler.h

@@ -34,12 +34,6 @@ class RootProtocolConformance;
 
 namespace Mangle {
 
-enum class DestructorKind {
-  NonDeallocating,
-  Deallocating,
-  IsolatedDeallocating
-};
-
 /// The mangler for AST declarations.
 class ASTMangler : public Mangler {
 protected:
@@ -211,7 +205,7 @@ class ASTMangler : public Mangler {
                            SymbolKind SKind = SymbolKind::Default);
 
   std::string mangleDestructorEntity(const DestructorDecl *decl,
-                                     DestructorKind kind,
+                                     bool isDeallocating,
                                      SymbolKind SKind = SymbolKind::Default);
 
   std::string mangleConstructorEntity(const ConstructorDecl *ctor,
@@ -709,8 +703,8 @@ class ASTMangler : public Mangler {
   bool tryAppendStandardSubstitution(const GenericTypeDecl *type);
 
   void appendConstructorEntity(const ConstructorDecl *ctor, bool isAllocating);
-
-  void appendDestructorEntity(const DestructorDecl *decl, DestructorKind kind);
+  
+  void appendDestructorEntity(const DestructorDecl *decl, bool isDeallocating);
 
   /// \param accessorKindCode The code to describe the accessor and addressor
   /// kind. Usually retrieved using getCodeForAccessorKind.

include/swift/AST/Decl.h

@@ -1368,10 +1368,6 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl> {
   std::optional<std::pair<CustomAttr *, NominalTypeDecl *>>
   getGlobalActorAttr() const;
 
-  /// Determine whether there is an explicit isolation attribute
-  /// of any kind.
-  bool hasExplicitIsolationAttribute() const;
-
   /// If an alternative module name is specified for this decl, e.g. using
   /// @_originalDefinedIn attribute, this function returns this module name.
   StringRef getAlternateModuleName() const;
@@ -3147,10 +3143,6 @@ class ValueDecl : public Decl {
   /// Retrieve the declaration that this declaration overrides, if any.
   ValueDecl *getOverriddenDecl() const;
 
-  /// Retrieve the declaration that this declaration overrides, including super
-  /// deinit.
-  ValueDecl *getOverriddenDeclOrSuperDeinit() const;
-
   /// Retrieve the declarations that this declaration overrides, if any.
   llvm::TinyPtrVector<ValueDecl *> getOverriddenDecls() const;
 
@@ -8915,10 +8907,6 @@ class DestructorDecl : public AbstractFunctionDecl {
   /// Retrieve the Objective-C selector for destructors.
   ObjCSelector getObjCSelector() const;
 
-  /// Retrieves destructor decl from the superclass, or nil if there is no
-  /// superclass
-  DestructorDecl *getSuperDeinit() const;
-
   static bool classof(const Decl *D) {
     return D->getKind() == DeclKind::Destructor;
   }

include/swift/AST/DeclAttr.def

@@ -434,17 +434,14 @@ SIMPLE_DECL_ATTR(rethrows, Rethrows,
 CONTEXTUAL_SIMPLE_DECL_ATTR(indirect, Indirect,
   DeclModifier | OnEnum | OnEnumElement | ABIBreakingToAdd | ABIBreakingToRemove | APIStableToAdd | APIStableToRemove,
   60)
-CONTEXTUAL_SIMPLE_DECL_ATTR(isolated, Isolated,
-  DeclModifier | OnDestructor | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
-  103)
 CONTEXTUAL_SIMPLE_DECL_ATTR(async, Async,
   DeclModifier | OnVar | OnFunc | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
   106)
 SIMPLE_DECL_ATTR(reasync, Reasync,
   OnFunc | OnConstructor | RejectByParser | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
   109)
 CONTEXTUAL_DECL_ATTR(nonisolated, Nonisolated,
-  DeclModifier | OnFunc | OnConstructor | OnDestructor | OnVar | OnSubscript | ABIStableToAdd | ABIStableToRemove | APIBreakingToAdd | APIStableToRemove,
+  DeclModifier | OnFunc | OnConstructor | OnVar | OnSubscript | ABIStableToAdd | ABIStableToRemove | APIBreakingToAdd | APIStableToRemove,
   112)
 CONTEXTUAL_SIMPLE_DECL_ATTR(distributed, DistributedActor,
   DeclModifier | OnClass | OnFunc | OnAccessor | OnVar | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,

include/swift/AST/DiagnosticsSema.def

@@ -5883,12 +5883,9 @@ ERROR(global_actor_not_usable_from_inline,none,
 NOTE(move_global_actor_attr_to_storage_decl,none,
      "move global actor attribute to %kind0", (const ValueDecl *))
 
-ERROR(actor_isolation_multiple_attr_2,none,
+ERROR(actor_isolation_multiple_attr,none,
       "%kind0 has multiple actor-isolation attributes ('%1' and '%2')",
       (const Decl *, StringRef, StringRef))
-ERROR(actor_isolation_multiple_attr_3,none,
-      "%0 %1 has multiple actor-isolation attributes ('%2', '%3' and '%4')",
-      (const Decl *, StringRef, StringRef, StringRef))
 ERROR(actor_isolation_override_mismatch,none,
       "%0 %kind1 has different actor isolation from %2 overridden declaration",
       (ActorIsolation, const ValueDecl *, ActorIsolation))
@@ -5905,14 +5902,6 @@ ERROR(async_named_decl_must_be_available_from_async,none,
 ERROR(async_unavailable_decl,none,
       "%kindbase0 is unavailable from asynchronous contexts%select{|; %1}1",
       (const ValueDecl *, StringRef))
-      
-      
-ERROR(isolated_deinit_no_isolation,none,
-      "deinit is marked isolated, but containing class %0 is not isolated to an actor",
-      (DeclName))
-ERROR(isolated_deinit_on_value_type,none,
-      "only classes and actors can have isolated deinit",
-      ())
 
 //------------------------------------------------------------------------------
 // MARK: String Processing

include/swift/AST/PrintOptions.h

@@ -37,8 +37,6 @@ class DeclContext;
 class Type;
 class ModuleDecl;
 enum class DeclAttrKind : unsigned;
-class DeclAttribute;
-class CustomAttr;
 class SynthesizedExtensionAnalyzer;
 struct PrintOptions;
 class SILPrintContext;
@@ -344,10 +342,6 @@ struct PrintOptions {
   /// Suppress emitting @available(*, noasync)
   bool SuppressNoAsyncAvailabilityAttr = false;
 
-  /// Suppress emitting isolated or async deinit, and emit open containing class
-  /// as public
-  bool SuppressIsolatedDeinit = false;
-
   /// Whether to print the \c{/*not inherited*/} comment on factory initializers.
   bool PrintFactoryInitializerComment = true;
 
@@ -399,8 +393,6 @@ struct PrintOptions {
       DeclAttrKind::FixedLayout, DeclAttrKind::ShowInInterface,
   };
 
-  std::vector<CustomAttr *> ExcludeCustomAttrList = {};
-
   /// List of attribute kinds that should be printed exclusively.
   /// Empty means allow all.
   std::vector<AnyAttrKind> ExclusiveAttrList;
@@ -635,8 +627,6 @@ struct PrintOptions {
     return false;
   }
 
-  bool excludeAttr(const DeclAttribute *DA) const;
-
   /// Retrieve the set of options for verbose printing to users.
   static PrintOptions printVerbose() {
     PrintOptions result;
@@ -692,8 +682,7 @@ struct PrintOptions {
     result.SkipPrivateSystemDecls = true;
     result.SkipUnderscoredSystemProtocols = true;
     result.SkipUnsafeCXXMethods = true;
-    result.SkipDeinit = false; // Deinit may have isolation attributes, which
-                               // are part of the interface
+    result.SkipDeinit = true;
     result.EmptyLineBetweenDecls = true;
     result.CascadeDocComment = true;
     result.ShouldQualifyNestedDeclarations =

include/swift/Basic/Features.def

@@ -408,8 +408,6 @@ SUPPRESSIBLE_EXPERIMENTAL_FEATURE(AllowUnsafeAttribute, true)
 /// Warn on use of unsafe constructs.
 EXPERIMENTAL_FEATURE(WarnUnsafe, true)
 
-SUPPRESSIBLE_LANGUAGE_FEATURE(IsolatedDeinit, 371, "isolated/async deinit")
-
 #undef EXPERIMENTAL_FEATURE_EXCLUDED_FROM_MODULE_INTERFACE
 #undef EXPERIMENTAL_FEATURE
 #undef UPCOMING_FEATURE

include/swift/Demangling/DemangleNodes.def

@@ -153,7 +153,6 @@ NODE(InfixOperator)
 CONTEXT_NODE(Initializer)
 CONTEXT_NODE(InitAccessor)
 NODE(Isolated)
-CONTEXT_NODE(IsolatedDeallocator)
 NODE(Sending)
 NODE(IsolatedAnyFunctionType)
 NODE(SendingResultFunctionType)

include/swift/Runtime/Concurrency.h

@@ -605,11 +605,6 @@ swift_task_createNullaryContinuationJob(
     size_t priority,
     AsyncTask *continuation);
 
-SWIFT_EXPORT_FROM(swift_Concurrency)
-SWIFT_CC(swift)
-void swift_task_deinitOnExecutor(void *object, DeinitWorkFunction *work,
-                                 SerialExecutorRef newExecutor, size_t flags);
-
 /// Report error about attempting to bind a task-local value from an illegal context.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 void swift_task_reportIllegalTaskLocalBindingWithinWithTaskGroup(

include/swift/Runtime/RuntimeFunctions.def

@@ -2278,7 +2278,7 @@ FUNCTION(GetTypeByMangledNameInContextInMetadataState2,
          EFFECT(MetaData),
          MEMEFFECTS(ArgMemOnly))
 
-// AsyncTask *swift_task_getCurrent();
+// AsyncTask *swift_task_getCurrent();s
 FUNCTION(GetCurrentTask,
          swift_task_getCurrent, SwiftCC,
          ConcurrencyAvailability,
@@ -2347,20 +2347,6 @@ FUNCTION(TaskSwitchFunc,
          ATTRS(NoUnwind),
          EFFECT(Concurrency),
          UNKNOWN_MEMEFFECTS)
-         
-// void swift_task_deinitOnExecutor(void *object,
-//                                  DeinitWorkFunction *work,
-//                                  SerialExecutorRef newExecutor,
-//                                  size_t flags);
-FUNCTION(DeinitOnExecutorFunc,
-         swift_task_deinitOnExecutor, SwiftCC,
-         ConcurrencyAvailability,
-         RETURNS(VoidTy),
-         ARGS(Int8PtrTy, Int8PtrTy, ExecutorFirstTy, ExecutorSecondTy, SizeTy),
-         ATTRS(NoUnwind),
-         EFFECT(Concurrency),
-         UNKNOWN_MEMEFFECTS)
-
 
 // AsyncTask *swift_continuation_init(AsyncContext *continuationContext,
 //                                    AsyncContinuationFlags);

include/swift/SIL/SILDeclRef.h

@@ -111,23 +111,19 @@ struct SILDeclRef {
     /// Initializer - this constant references the initializing constructor
     /// entry point of the class ConstructorDecl in loc.
     Initializer,
-
+    
     /// EnumElement - this constant references the injection function for
     /// an EnumElementDecl.
     EnumElement,
-
+    
     /// Destroyer - this constant references the destroying destructor for the
     /// DestructorDecl in loc.
     Destroyer,
 
     /// Deallocator - this constant references the deallocating
     /// destructor for the DestructorDecl in loc.
     Deallocator,
-
-    /// Deallocator - this constant references the isolated deallocating
-    /// destructor for the DestructorDecl in loc.
-    IsolatedDeallocator,
-
+    
     /// GlobalAccessor - this constant references the lazy-initializing
     /// accessor for the global VarDecl in loc.
     GlobalAccessor,
@@ -343,8 +339,7 @@ struct SILDeclRef {
   }
   /// True if the SILDeclRef references a destructor entry point.
   bool isDestructor() const {
-    return kind == Kind::Destroyer || kind == Kind::Deallocator ||
-           kind == Kind::IsolatedDeallocator;
+    return kind == Kind::Destroyer || kind == Kind::Deallocator;
   }
   /// True if the SILDeclRef references an enum entry point.
   bool isEnumElement() const {

include/swift/SIL/SILModule.h

@@ -1113,9 +1113,6 @@ namespace Lowering {
 /// Determine whether the given class will be allocated/deallocated using the
 /// Objective-C runtime, i.e., +alloc and -dealloc.
 LLVM_LIBRARY_VISIBILITY bool usesObjCAllocator(ClassDecl *theClass);
-/// Determine if isolating destructor is needed.
-LLVM_LIBRARY_VISIBILITY bool needsIsolatingDestructor(DestructorDecl *dd);
-
 } // namespace Lowering
 } // namespace swift
 

lib/AST/ASTMangler.cpp

@@ -129,11 +129,11 @@ std::string ASTMangler::mangleEntity(const ValueDecl *decl, SymbolKind SKind) {
 }
 
 std::string ASTMangler::mangleDestructorEntity(const DestructorDecl *decl,
-                                               DestructorKind kind,
+                                               bool isDeallocating,
                                                SymbolKind SKind) {
   llvm::SaveAndRestore X(AllowInverses, inversesAllowed(decl));
   beginMangling();
-  appendDestructorEntity(decl, kind);
+  appendDestructorEntity(decl, isDeallocating);
   appendSymbolKind(SKind);
   return finalize();
 }
@@ -838,7 +838,7 @@ void ASTMangler::appendAnyDecl(const ValueDecl *Decl) {
   if (auto Ctor = dyn_cast<ConstructorDecl>(Decl)) {
     appendConstructorEntity(Ctor, /*isAllocating=*/false);
   } else if (auto Dtor = dyn_cast<DestructorDecl>(Decl)) {
-    appendDestructorEntity(Dtor, DestructorKind::NonDeallocating);
+    appendDestructorEntity(Dtor, /*isDeallocating=*/false);
   } else if (auto GTD = dyn_cast<GenericTypeDecl>(Decl)) {
     appendAnyGenericType(GTD);
   } else if (isa<AssociatedTypeDecl>(Decl)) {
@@ -940,7 +940,7 @@ std::string ASTMangler::mangleHasSymbolQuery(const ValueDecl *Decl) {
   if (auto Ctor = dyn_cast<ConstructorDecl>(Decl)) {
     appendConstructorEntity(Ctor, /*isAllocating=*/false);
   } else if (auto Dtor = dyn_cast<DestructorDecl>(Decl)) {
-    appendDestructorEntity(Dtor, DestructorKind::NonDeallocating);
+    appendDestructorEntity(Dtor, /*isDeallocating=*/false);
   } else if (auto GTD = dyn_cast<GenericTypeDecl>(Decl)) {
     appendAnyGenericType(GTD);
   } else if (isa<AssociatedTypeDecl>(Decl)) {
@@ -2447,8 +2447,8 @@ void ASTMangler::appendContext(const DeclContext *ctx,
     }
 
     if (auto dtor = dyn_cast<DestructorDecl>(fn))
-      return appendDestructorEntity(dtor, DestructorKind::NonDeallocating);
-
+      return appendDestructorEntity(dtor, /*deallocating*/ false);
+    
     return appendEntity(fn);
   }
 
@@ -3953,20 +3953,10 @@ void ASTMangler::appendConstructorEntity(const ConstructorDecl *ctor,
 }
 
 void ASTMangler::appendDestructorEntity(const DestructorDecl *dtor,
-                                        DestructorKind kind) {
+                                        bool isDeallocating) {
   BaseEntitySignature base(dtor);
   appendContextOf(dtor, base);
-  switch (kind) {
-  case DestructorKind::NonDeallocating:
-    appendOperator("fd");
-    break;
-  case DestructorKind::Deallocating:
-    appendOperator("fD");
-    break;
-  case DestructorKind::IsolatedDeallocating:
-    appendOperator("fZ");
-    break;
-  }
+  appendOperator(isDeallocating ? "fD" : "fd");
 }
 
 void ASTMangler::appendAccessorEntity(StringRef accessorKindCode,