[AST/ASTGen/Sema/Serialization] Remove @execution attribute

Complete the transition from `@execution` to `@concurrent` and `nonisolated(nonsending)`

Author: xedin

include/swift/AST/ASTBridging.h

@@ -910,15 +910,6 @@ void BridgedAvailableAttr_setIsGroupedWithWildcard(BridgedAvailableAttr cAttr);
 SWIFT_NAME("BridgedAvailableAttr.setIsGroupTerminator(self:)")
 void BridgedAvailableAttr_setIsGroupTerminator(BridgedAvailableAttr cAttr);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedExecutionKind {
-  BridgedExecutionKindCaller,
-};
-
-SWIFT_NAME("BridgedExecutionAttr.createParsed(_:atLoc:range:behavior:)")
-BridgedExecutionAttr BridgedExecutionAttr_createParsed(
-    BridgedASTContext cContext, BridgedSourceLoc atLoc,
-    BridgedSourceRange range, BridgedExecutionKind behavior);
-
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedAccessLevel {
   BridgedAccessLevelPrivate,
   BridgedAccessLevelFilePrivate,
@@ -2596,25 +2587,13 @@ BridgedConventionTypeAttr BridgedConventionTypeAttr_createParsed(
     BridgedSourceLoc cNameLoc, BridgedDeclNameRef cWitnessMethodProtocol,
     BridgedStringRef cClangType, BridgedSourceLoc cClangTypeLoc);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedExecutionTypeAttrExecutionKind {
-  BridgedExecutionTypeAttrExecutionKind_Caller
-};
-
 SWIFT_NAME("BridgedDifferentiableTypeAttr.createParsed(_:atLoc:nameLoc:"
            "parensRange:kind:kindLoc:)")
 BridgedDifferentiableTypeAttr BridgedDifferentiableTypeAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceLoc cNameLoc, BridgedSourceRange cParensRange,
     BridgedDifferentiabilityKind cKind, BridgedSourceLoc cKindLoc);
 
-SWIFT_NAME("BridgedExecutionTypeAttr.createParsed(_:atLoc:nameLoc:parensRange:"
-           "behavior:behaviorLoc:)")
-BridgedExecutionTypeAttr BridgedExecutionTypeAttr_createParsed(
-    BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
-    BridgedSourceLoc cNameLoc, BridgedSourceRange cParensRange,
-    BridgedExecutionTypeAttrExecutionKind behavior,
-    BridgedSourceLoc cBehaviorLoc);
-
 SWIFT_NAME("BridgedIsolatedTypeAttr.createParsed(_:atLoc:nameLoc:parensRange:"
            "isolationKind:isolationKindLoc:)")
 BridgedIsolatedTypeAttr BridgedIsolatedTypeAttr_createParsed(

include/swift/AST/Attr.h

@@ -236,10 +236,6 @@ class DeclAttribute : public AttributeBase {
 
       NumFeatures : 31
     );
-
-    SWIFT_INLINE_BITFIELD(ExecutionAttr, DeclAttribute, NumExecutionKindBits,
-      Behavior : NumExecutionKindBits
-    );
   } Bits;
   // clang-format on
 
@@ -3284,34 +3280,6 @@ class ABIAttr : public DeclAttribute {
   }
 };
 
-class ExecutionAttr : public DeclAttribute {
-public:
-  ExecutionAttr(SourceLoc AtLoc, SourceRange Range,
-                ExecutionKind behavior,
-                bool Implicit)
-      : DeclAttribute(DeclAttrKind::Execution, AtLoc, Range, Implicit) {
-    Bits.ExecutionAttr.Behavior = static_cast<uint8_t>(behavior);
-  }
-
-  ExecutionAttr(ExecutionKind behavior, bool Implicit)
-      : ExecutionAttr(/*AtLoc=*/SourceLoc(), /*Range=*/SourceRange(), behavior,
-                      Implicit) {}
-
-  ExecutionKind getBehavior() const {
-    return static_cast<ExecutionKind>(Bits.ExecutionAttr.Behavior);
-  }
-
-  static bool classof(const DeclAttribute *DA) {
-    return DA->getKind() == DeclAttrKind::Execution;
-  }
-
-  UNIMPLEMENTED_CLONE(ExecutionAttr)
-
-  bool isEquivalent(const ExecutionAttr *other, Decl *attachedTo) const {
-    return getBehavior() == other->getBehavior();
-  }
-};
-
 /// Attributes that may be applied to declarations.
 class DeclAttributes {
   /// Linked list of declaration attributes.
@@ -3771,10 +3739,6 @@ class alignas(1 << AttrAlignInBits) TypeAttribute
     SWIFT_INLINE_BITFIELD_FULL(IsolatedTypeAttr, TypeAttribute, 8,
       Kind : 8
     );
-
-    SWIFT_INLINE_BITFIELD_FULL(ExecutionTypeAttr, TypeAttribute, 8,
-      Behavior : 8
-    );
   } Bits;
   // clang-format on
 
@@ -4046,28 +4010,6 @@ class IsolatedTypeAttr : public SimpleTypeAttrWithArgs<TypeAttrKind::Isolated> {
   void printImpl(ASTPrinter &printer, const PrintOptions &options) const;
 };
 
-/// The @execution function type attribute.
-class ExecutionTypeAttr : public SimpleTypeAttrWithArgs<TypeAttrKind::Execution> {
-  SourceLoc BehaviorLoc;
-
-public:
-  ExecutionTypeAttr(SourceLoc atLoc, SourceLoc kwLoc, SourceRange parensRange,
-                    Located<ExecutionKind> behavior)
-      : SimpleTypeAttr(atLoc, kwLoc, parensRange), BehaviorLoc(behavior.Loc) {
-    Bits.ExecutionTypeAttr.Behavior = uint8_t(behavior.Item);
-  }
-
-  ExecutionKind getBehavior() const {
-    return ExecutionKind(Bits.ExecutionTypeAttr.Behavior);
-  }
-
-  SourceLoc getBehaviorLoc() const {
-    return BehaviorLoc;
-  }
-
-  void printImpl(ASTPrinter &printer, const PrintOptions &options) const;
-};
-
 using TypeOrCustomAttr =
   llvm::PointerUnion<CustomAttr*, TypeAttribute*>;
 

include/swift/AST/AttrKind.h

@@ -130,14 +130,6 @@ enum class ExternKind: uint8_t {
 enum : unsigned { NumExternKindBits =
   countBitsUsed(static_cast<unsigned>(ExternKind::Last_ExternKind)) };
 
-enum class ExecutionKind : uint8_t {
-  Caller = 0,
-  Last_ExecutionKind = Caller
-};
-
-enum : unsigned { NumExecutionKindBits =
-  countBitsUsed(static_cast<unsigned>(ExecutionKind::Last_ExecutionKind)) };
-
 enum class NonIsolatedModifier : uint8_t {
   None = 0,
   Unsafe,

include/swift/AST/Decl.h

@@ -8146,8 +8146,6 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     return cast_or_null<AbstractFunctionDecl>(ValueDecl::getOverriddenDecl());
   }
 
-  std::optional<ExecutionKind> getExecutionBehavior() const;
-
   /// Whether the declaration is later overridden in the module
   ///
   /// Overrides are resolved during type checking; only query this field after

include/swift/AST/DeclAttr.def

@@ -862,11 +862,7 @@ DECL_ATTR(abi, ABI,
   165)
 DECL_ATTR_FEATURE_REQUIREMENT(ABI, ABIAttribute)
 
-DECL_ATTR(execution, Execution,
-  OnFunc | OnConstructor | OnSubscript | OnVar,
-  ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove | UnconstrainedInABIAttr,
-  166)
-DECL_ATTR_FEATURE_REQUIREMENT(Execution, ExecutionAttribute)
+// Unused '166': Used to be `@execution(caller | concurrent)` replaced with `@concurrent` and `nonisolated(nonsending)`
 
 SIMPLE_DECL_ATTR(const, ConstVal,
   OnParam | OnVar | OnFunc,

include/swift/AST/DiagnosticsParse.def

@@ -1700,14 +1700,6 @@ ERROR(attr_isolated_expected_rparen,none,
 ERROR(attr_isolated_expected_kind,none,
       "expected 'any' as the isolation kind", ())
 
-ERROR(attr_execution_expected_lparen,none,
-      "expected '(' after '@execution'",
-      ())
-ERROR(attr_execution_expected_rparen,none,
-      "expected ')' after execution behavior", ())
-ERROR(attr_execution_expected_kind,none,
-      "expected 'concurrent' or 'caller' as the execution behavior", ())
-
 ERROR(attr_private_import_expected_rparen,none,
       "expected ')' after function name for @_private", ())
 ERROR(attr_private_import_expected_sourcefile, none,

include/swift/AST/DiagnosticsSema.def

@@ -8550,7 +8550,7 @@ GROUPED_ERROR(isolated_conformance_wrong_domain,IsolatedConformances,none,
       (ActorIsolation, Type, DeclName, ActorIsolation))
 
 //===----------------------------------------------------------------------===//
-// MARK: @execution, @concurrent and nonisolated(nonsending) attributes
+// MARK: @concurrent and nonisolated(nonsending) attributes
 //===----------------------------------------------------------------------===//
 
 ERROR(execution_behavior_only_on_async,none,

include/swift/AST/TypeAttr.def

@@ -67,7 +67,6 @@ TYPE_ATTR(_opaqueReturnTypeOf, OpaqueReturnTypeOf)
 TYPE_ATTR(isolated, Isolated)
 SIMPLE_TYPE_ATTR(nonisolated, Nonisolated)
 SIMPLE_TYPE_ATTR(_addressable, Addressable)
-TYPE_ATTR(execution, Execution)
 SIMPLE_TYPE_ATTR(concurrent, Concurrent)
 
 // SIL-specific attributes

lib/AST/ASTDumper.cpp

@@ -618,12 +618,6 @@ static StringRef getDumpString(FunctionRefInfo::ApplyLevel applyLevel) {
     return "double_apply";
   }
 }
-static StringRef getDumpString(ExecutionKind kind) {
-  switch (kind) {
-  case ExecutionKind::Caller:
-    return "caller";
-  }
-}
 static StringRef getDumpString(ExplicitSafety safety) {
   switch (safety) {
   case ExplicitSafety::Unspecified:
@@ -4936,11 +4930,6 @@ class PrintAttribute : public AttributeVisitor<PrintAttribute, void, Label>,
 
 #undef TRIVIAL_ATTR_PRINTER
 
-  void visitExecutionAttr(ExecutionAttr *Attr, Label label) {
-    printCommon(Attr, "execution_attr", label);
-    printField(Attr->getBehavior(), Label::always("behavior"));
-    printFoot();
-  }
   void visitABIAttr(ABIAttr *Attr, Label label) {
     printCommon(Attr, "abi_attr", label);
     printRec(Attr->abiDecl, Label::always("decl"));
@@ -6349,7 +6338,7 @@ namespace {
           printFlag("@isolated(any)");
           break;
         case FunctionTypeIsolation::Kind::NonIsolatedCaller:
-          printFlag("@execution(caller)");
+          printFlag("nonisolated(nonsending)");
           break;
         }
       }

lib/AST/ASTPrinter.cpp

@@ -3306,7 +3306,7 @@ static void
 suppressingFeatureExecutionAttribute(PrintOptions &options,
                                     llvm::function_ref<void()> action) {
   llvm::SaveAndRestore<bool> scope1(options.SuppressExecutionAttribute, true);
-  ExcludeAttrRAII scope2(options.ExcludeAttrList, DeclAttrKind::Execution);
+  ExcludeAttrRAII scope2(options.ExcludeAttrList, DeclAttrKind::Concurrent);
   action();
 }
 
@@ -6509,8 +6509,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       break;
 
     case FunctionTypeIsolation::Kind::NonIsolatedCaller:
-      if (!Options.SuppressExecutionAttribute)
-        Printer << "@execution(caller) ";
+      Printer << "nonisolated(nonsending) ";
       break;
     }