Revert "[AST] Extend @_inheritActorContext attribute to support optional always modifier"

hamishknight · hamishknight · commit 4d08f6424c4e · 2025-05-22T15:44:00.000+01:00
This reverts commit 04d4676.
diff --git a/docs/ReferenceGuides/UnderscoredAttributes.md b/docs/ReferenceGuides/UnderscoredAttributes.md
@@ -600,43 +600,6 @@ inherit the actor context (i.e. what actor it should be run on) based on the
 declaration site of the closure rather than be non-Sendable. This does not do
 anything if the closure is synchronous.
 
-This works with global actors as expected:
-
-```swift 
-@MainActor
-func test() {
-  Task { /* main actor isolated */ }
-}
-```
-
-However, for the inference to work with instance actors (i.e. `isolated` parameters),
-the closure must capture the isolated parameter explicitly:
-
-```swift 
-func test(actor: isolated (any Actor)) {
-  Task { /* non isolated */ } // !!!
-}
-
-func test(actor: isolated (any Actor)) {
-  Task { // @_inheritActorContext
-    _ = actor // 'actor'-isolated 
-  }
-}
-```
-
-The attribute takes an optional modifier '`always`', which changes this behavior 
-and *always* captures the enclosing isolated context, rather than forcing developers
-to perform the explicit capture themselfes:
-
-```swift
-func test(actor: isolated (any Actor)) {
-  Task.immediate { // @_inheritActorContext(always)
-    // 'actor'-isolated!
-    // (without having to capture 'actor explicitly')
-  }
-}
-```
-
 DISCUSSION: The reason why this does nothing when the closure is synchronous is
 since it does not have the ability to hop to the appropriate executor before it
 is run, so we may create concurrency errors.
diff --git a/include/swift/AST/Attr.h b/include/swift/AST/Attr.h
@@ -230,10 +230,6 @@ class DeclAttribute : public AttributeBase {
       Modifier : NumNonIsolatedModifierBits
     );
 
-    SWIFT_INLINE_BITFIELD(InheritActorContextAttr, DeclAttribute, NumInheritActorContextKindBits,
-      Modifier : NumInheritActorContextKindBits
-    );
-
     SWIFT_INLINE_BITFIELD_FULL(AllowFeatureSuppressionAttr, DeclAttribute, 1+31,
       : NumPadBits,
       Inverted : 1,
@@ -3015,50 +3011,6 @@ class NonisolatedAttr final : public DeclAttribute {
   }
 };
 
-/// Represents @_inheritActorContext modifier.
-class InheritActorContextAttr final : public DeclAttribute {
-public:
-  InheritActorContextAttr(SourceLoc atLoc, SourceRange range,
-                          InheritActorContextModifier modifier, bool implicit)
-      : DeclAttribute(DeclAttrKind::InheritActorContext, atLoc, range,
-                      implicit) {
-    Bits.InheritActorContextAttr.Modifier = static_cast<unsigned>(modifier);
-    assert((getModifier() == modifier) && "not enough bits for modifier");
-  }
-
-  InheritActorContextModifier getModifier() const {
-    return static_cast<InheritActorContextModifier>(
-        Bits.InheritActorContextAttr.Modifier);
-  }
-
-  bool isAlways() const {
-    return getModifier() == InheritActorContextModifier::Always;
-  }
-
-  static InheritActorContextAttr *
-  createImplicit(ASTContext &ctx, InheritActorContextModifier modifier =
-                                      InheritActorContextModifier::None) {
-    return new (ctx)
-        InheritActorContextAttr(/*atLoc*/ {}, /*range*/ {}, modifier,
-                                /*implicit=*/true);
-  }
-
-  static bool classof(const DeclAttribute *DA) {
-    return DA->getKind() == DeclAttrKind::InheritActorContext;
-  }
-
-  /// Create a copy of this attribute.
-  InheritActorContextAttr *clone(ASTContext &ctx) const {
-    return new (ctx)
-        InheritActorContextAttr(AtLoc, Range, getModifier(), isImplicit());
-  }
-
-  bool isEquivalent(const InheritActorContextAttr *other,
-                    Decl *attachedTo) const {
-    return getModifier() == other->getModifier();
-  }
-};
-
 /// A macro role attribute, spelled with either @attached or @freestanding,
 /// which declares one of the roles that a given macro can inhabit.
 class MacroRoleAttr final
diff --git a/include/swift/AST/AttrKind.h b/include/swift/AST/AttrKind.h
@@ -142,22 +142,6 @@ enum : unsigned {
       static_cast<unsigned>(NonIsolatedModifier::Last_NonIsolatedModifier))
 };
 
-enum class InheritActorContextModifier : uint8_t {
-  /// Inherit the actor execution context if the isolated parameter was
-  /// captured by the closure, context is nonisolated or isolated to a
-  /// global actor.
-  None = 0,
-  /// Always inherit the actor context, even when the isolated parameter
-  /// for the context is not closed over explicitly.
-  Always,
-  Last_InheritActorContextKind = Always
-};
-
-enum : unsigned {
-  NumInheritActorContextKindBits = countBitsUsed(static_cast<unsigned>(
-      InheritActorContextModifier::Last_InheritActorContextKind))
-};
-
 enum class DeclAttrKind : unsigned {
 #define DECL_ATTR(_, CLASS, ...) CLASS,
 #define LAST_DECL_ATTR(CLASS) Last_DeclAttr = CLASS,
diff --git a/include/swift/AST/DeclAttr.def b/include/swift/AST/DeclAttr.def
@@ -620,10 +620,9 @@ SIMPLE_DECL_ATTR(_implicitSelfCapture, ImplicitSelfCapture,
   UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIBreakingToRemove | ForbiddenInABIAttr,
   115)
 
-DECL_ATTR(_inheritActorContext, InheritActorContext,
+SIMPLE_DECL_ATTR(_inheritActorContext, InheritActorContext,
   OnParam,
-  // since the _inheritActorContext(always) forces an actor capture, it changes ABI of the closure this applies to
-  UserInaccessible | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove | UnconstrainedInABIAttr,
+  UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIBreakingToAdd | APIBreakingToRemove | ForbiddenInABIAttr,
   116)
 
 SIMPLE_DECL_ATTR(_eagerMove, EagerMove,
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -8595,13 +8595,6 @@ GROUPED_ERROR(isolated_conformance_wrong_domain,IsolatedConformances,none,
       "%0 conformance of %1 to %2 cannot be used in %3 context",
       (ActorIsolation, Type, DeclName, ActorIsolation))
 
-//===----------------------------------------------------------------------===//
-// MARK: @_inheritActorContext
-//===----------------------------------------------------------------------===//
-ERROR(inherit_actor_context_only_on_func_types,none,
-      "%0 only applies to parameters with function types (got: %1)",
-      (DeclAttribute, Type))
-
 //===----------------------------------------------------------------------===//
 // MARK: @concurrent and nonisolated(nonsending) attributes
 //===----------------------------------------------------------------------===//
diff --git a/include/swift/AST/KnownIdentifiers.def b/include/swift/AST/KnownIdentifiers.def
@@ -325,7 +325,6 @@ IDENTIFIER(SerializationRequirement)
 IDENTIFIER_WITH_NAME(builderSelf, "$builderSelf")
 
 // Attribute options
-IDENTIFIER(always)
 IDENTIFIER_(_always)
 IDENTIFIER_(assumed)
 IDENTIFIER(checked)
diff --git a/include/swift/Parse/IDEInspectionCallbacks.h b/include/swift/Parse/IDEInspectionCallbacks.h
@@ -39,8 +39,7 @@ enum class ParameterizedDeclAttributeKind {
   Available,
   FreestandingMacro,
   AttachedMacro,
-  StorageRestrictions,
-  InheritActorContext
+  StorageRestrictions
 };
 
 /// A bit of a hack. When completing inside the '@storageRestrictions'
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -4976,6 +4976,7 @@ class PrintAttribute : public AttributeVisitor<PrintAttribute, void, Label>,
   TRIVIAL_ATTR_PRINTER(ImplicitSelfCapture, implicit_self_capture)
   TRIVIAL_ATTR_PRINTER(Indirect, indirect)
   TRIVIAL_ATTR_PRINTER(Infix, infix)
+  TRIVIAL_ATTR_PRINTER(InheritActorContext, inherit_actor_context)
   TRIVIAL_ATTR_PRINTER(InheritsConvenienceInitializers,
                        inherits_convenience_initializers)
   TRIVIAL_ATTR_PRINTER(Inlinable, inlinable)
@@ -5300,12 +5301,6 @@ class PrintAttribute : public AttributeVisitor<PrintAttribute, void, Label>,
     printFlag(Attr->isNonSending(), "nonsending");
     printFoot();
   }
-  void visitInheritActorContextAttr(InheritActorContextAttr *Attr,
-                                    Label label) {
-    printCommon(Attr, "inherit_actor_context_attr", label);
-    printFlag(Attr->isAlways(), "always");
-    printFoot();
-  }
   void visitObjCAttr(ObjCAttr *Attr, Label label) {
     printCommon(Attr, "objc_attr", label);
     if (Attr->hasName())
diff --git a/lib/AST/Attr.cpp b/lib/AST/Attr.cpp
@@ -1531,18 +1531,6 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
     break;
   }
 
-  case DeclAttrKind::InheritActorContext: {
-    Printer.printAttrName("@_inheritActorContext");
-    switch (cast<InheritActorContextAttr>(this)->getModifier()) {
-    case InheritActorContextModifier::None:
-      break;
-    case InheritActorContextModifier::Always:
-      Printer << "(always)";
-      break;
-    }
-    break;
-  }
-
   case DeclAttrKind::MacroRole: {
     auto Attr = cast<MacroRoleAttr>(this);
 
@@ -1927,13 +1915,6 @@ StringRef DeclAttribute::getAttrName() const {
     case NonIsolatedModifier::NonSending:
       return "nonisolated(nonsending)";
     }
-  case DeclAttrKind::InheritActorContext:
-    switch (cast<InheritActorContextAttr>(this)->getModifier()) {
-    case InheritActorContextModifier::None:
-      return "_inheritActorContext";
-    case InheritActorContextModifier::Always:
-      return "_inheritActorContext(always)";
-    }
   case DeclAttrKind::MacroRole:
     switch (cast<MacroRoleAttr>(this)->getMacroSyntax()) {
     case MacroSyntax::Freestanding:
diff --git a/lib/IDE/CompletionLookup.cpp b/lib/IDE/CompletionLookup.cpp
@@ -3141,9 +3141,6 @@ void CompletionLookup::getAttributeDeclParamCompletions(
     addDeclAttrParamKeyword("unsafe", /*Parameters=*/{}, "", false);
     addDeclAttrParamKeyword("nonsending", /*Parameters=*/{}, "", false);
     break;
-  case ParameterizedDeclAttributeKind::InheritActorContext:
-    addDeclAttrParamKeyword("always", /*Parameters=*/{}, "", false);
-    break;
   case ParameterizedDeclAttributeKind::AccessControl:
     addDeclAttrParamKeyword("set", /*Parameters=*/{}, "", false);
     break;
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -3773,25 +3773,6 @@ ParserStatus Parser::parseNewDeclAttribute(DeclAttributes &Attributes,
     }
     break;
   }
-  case DeclAttrKind::InheritActorContext: {
-    AttrRange = Loc;
-    std::optional<InheritActorContextModifier> Modifier(
-        InheritActorContextModifier::None);
-    Modifier = parseSingleAttrOption<InheritActorContextModifier>(
-        *this, Loc, AttrRange, AttrName, DK,
-        {{Context.Id_always, InheritActorContextModifier::Always}}, *Modifier,
-        ParameterizedDeclAttributeKind::InheritActorContext);
-    if (!Modifier) {
-      return makeParserSuccess();
-    }
-
-    if (!DiscardAttribute) {
-      Attributes.add(new (Context) InheritActorContextAttr(
-          AtLoc, AttrRange, *Modifier, /*implicit=*/false));
-    }
-
-    break;
-  }
   case DeclAttrKind::MacroRole: {
     auto syntax = (AttrName == "freestanding" ? MacroSyntax::Freestanding
                                               : MacroSyntax::Attached);
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -184,6 +184,7 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
   IGNORED_ATTR(AtRethrows)
   IGNORED_ATTR(AtReasync)
   IGNORED_ATTR(ImplicitSelfCapture)
+  IGNORED_ATTR(InheritActorContext)
   IGNORED_ATTR(Preconcurrency)
   IGNORED_ATTR(BackDeployed)
   IGNORED_ATTR(Documentation)
@@ -441,10 +442,8 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
   void visitNonisolatedAttr(NonisolatedAttr *attr);
   void visitIsolatedAttr(IsolatedAttr *attr);
 
-  void visitInheritActorContextAttr(InheritActorContextAttr *attr);
-
   void visitNoImplicitCopyAttr(NoImplicitCopyAttr *attr);
-
+  
   void visitAlwaysEmitConformanceMetadataAttr(AlwaysEmitConformanceMetadataAttr *attr);
 
   void visitExtractConstantsFromMembersAttr(ExtractConstantsFromMembersAttr *attr);
@@ -7847,22 +7846,6 @@ void AttributeChecker::visitAsyncAttr(AsyncAttr *attr) {
   }
 }
 
-void AttributeChecker::visitInheritActorContextAttr(
-    InheritActorContextAttr *attr) {
-  auto *P = dyn_cast<ParamDecl>(D);
-  if (!P)
-    return;
-
-  auto paramTy = P->getInterfaceType();
-  auto *funcTy =
-      paramTy->lookThroughAllOptionalTypes()->getAs<AnyFunctionType>();
-  if (!funcTy) {
-    diagnoseAndRemoveAttr(attr, diag::inherit_actor_context_only_on_func_types,
-                          attr, paramTy);
-    return;
-  }
-}
-
 void AttributeChecker::visitMarkerAttr(MarkerAttr *attr) {
   auto proto = dyn_cast<ProtocolDecl>(D);
   if (!proto)
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
@@ -6544,17 +6544,6 @@ llvm::Error DeclDeserializer::deserializeDeclCommon() {
         break;
       }
 
-      case decls_block::InheritActorContext_DECL_ATTR: {
-        unsigned modifier;
-        bool isImplicit{};
-        serialization::decls_block::InheritActorContextDeclAttrLayout::
-            readRecord(scratch, modifier, isImplicit);
-        Attr = new (ctx) InheritActorContextAttr(
-            {}, {}, static_cast<InheritActorContextModifier>(modifier),
-            isImplicit);
-        break;
-      }
-
       case decls_block::MacroRole_DECL_ATTR: {
         bool isImplicit;
         uint8_t rawMacroSyntax;
diff --git a/lib/Serialization/ModuleFormat.h b/lib/Serialization/ModuleFormat.h
@@ -58,7 +58,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 951; // add modifier to @_inheritActorContext
+const uint16_t SWIFTMODULE_VERSION_MINOR = 950; // DeclNameRef module selectors
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -2556,12 +2556,6 @@ namespace decls_block {
                      BCFixed<1>  // implicit flag
                      >;
 
-  using InheritActorContextDeclAttrLayout =
-       BCRecordLayout<InheritActorContext_DECL_ATTR,
-                     BCFixed<1>, // the modifier (none = 0, always = 1)
-                     BCFixed<1>  // implicit flag
-                     >;
-
   using MacroRoleDeclAttrLayout = BCRecordLayout<
     MacroRole_DECL_ATTR,
     BCFixed<1>,                // implicit flag
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
@@ -3451,16 +3451,6 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
       return;
     }
 
-    case DeclAttrKind::InheritActorContext: {
-      auto *theAttr = cast<InheritActorContextAttr>(DA);
-      auto abbrCode =
-          S.DeclTypeAbbrCodes[InheritActorContextDeclAttrLayout::Code];
-      InheritActorContextDeclAttrLayout::emitRecord(
-          S.Out, S.ScratchRecord, abbrCode,
-          static_cast<uint8_t>(theAttr->getModifier()), theAttr->isImplicit());
-      return;
-    }
-
     case DeclAttrKind::MacroRole: {
       auto *theAttr = cast<MacroRoleAttr>(DA);
       auto abbrCode = S.DeclTypeAbbrCodes[MacroRoleDeclAttrLayout::Code];
diff --git a/test/attr/attr_abi.swift b/test/attr/attr_abi.swift
@@ -1406,19 +1406,16 @@ func nonEphemeral2(_: UnsafeRawPointer) {}
 @abi(func disfavoredOverload3(_: UnsafeRawPointer))
 func nonEphemeral3(@_nonEphemeral _: UnsafeRawPointer) {}
 
-// @_inheritActorContext
-@abi(func inheritActorContext1(@_inheritActorContext fn: @Sendable @escaping () async -> Void))
+// @_inheritActorContext -- banned in @abi
+@abi(func inheritActorContext1(@_inheritActorContext fn: @Sendable @escaping () async -> Void)) // expected-error {{unused '_inheritActorContext' attribute in '@abi'}} {{32-53=}}
 func inheritActorContext1(@_inheritActorContext fn: @Sendable @escaping () async -> Void) {}
 
-@abi(func inheritActorContext2(@_inheritActorContext fn: @Sendable @escaping () async -> Void))
+@abi(func inheritActorContext2(@_inheritActorContext fn: @Sendable @escaping () async -> Void)) // expected-error {{unused '_inheritActorContext' attribute in '@abi'}} {{32-53=}}
 func inheritActorContext2(fn: @Sendable @escaping () async -> Void) {}
 
 @abi(func inheritActorContext3(fn: @Sendable @escaping () async -> Void))
 func inheritActorContext3(@_inheritActorContext fn: @Sendable @escaping () async -> Void) {}
 
-@abi(func inheritActorContext4(@_inheritActorContext(always) fn: @Sendable @escaping () async -> Void))
-func inheritActorContext4(fn: @Sendable @escaping () async -> Void) {}
-
 // @excusivity(checked/unchecked) -- banned in @abi
 class Exclusivity {
   @abi(var checked00: Int)
diff --git a/test/attr/attr_inheritActorContext.swift b/test/attr/attr_inheritActorContext.swift
