AST: Restrict @execution to func and init declarations

Author: AnthonyLatsis

include/swift/AST/DeclAttr.def

@@ -862,7 +862,7 @@ DECL_ATTR(abi, ABI,
 DECL_ATTR_FEATURE_REQUIREMENT(ABI, ABIAttribute)
 
 DECL_ATTR(execution, Execution,
-  OnAbstractFunction,
+  OnFunc | OnConstructor,
   ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
   166)
 DECL_ATTR_FEATURE_REQUIREMENT(Execution, ExecutionAttribute)

lib/AST/FeatureSet.cpp

@@ -466,12 +466,6 @@ static bool usesFeatureBuiltinEmplaceTypedThrows(Decl *decl) {
 }
 
 static bool usesFeatureExecutionAttribute(Decl *decl) {
-  if (auto *ASD = dyn_cast<AbstractStorageDecl>(decl)) {
-    if (auto *getter = ASD->getAccessor(AccessorKind::Get))
-      return usesFeatureExecutionAttribute(getter);
-    return false;
-  }
-
   if (decl->getAttrs().hasAttribute<ExecutionAttr>())
     return true;
 

test/ModuleInterface/execution_attr.swift

@@ -30,37 +30,5 @@ public struct Test {
   // CHECK-NEXT:  public func other(_: () async -> Swift.Void)
   // CHECK-NEXT:  #endif
   public func other(_: @execution(caller) () async -> Void) {}
-
-  // CHECK: #if compiler(>=5.3) && $ExecutionAttribute
-  // CHECK-NEXT: public var test: Swift.Int {
-  // CHECK-NEXT:   @execution(caller) get async
-  // CHECK-NEXT: }
-  // CHECK-NEXT: #else
-  // CHECK-NEXT: public var test: Swift.Int {
-  // CHECK-NEXT:   get async
-  // CHECK-NEXT: }
-  // CHECK-NEXT: #endif
-  public var test: Int {
-    @execution(caller)
-    get async {
-      42
-    }
-  }
-
-  // CHECK: #if compiler(>=5.3) && $ExecutionAttribute
-  // CHECK-NEXT: public subscript(x: Swift.Int) -> Swift.Bool {
-  // CHECK-NEXT:   @execution(caller) get async
-  // CHECK-NEXT: }
-  // CHECK-NEXT: #else
-  // CHECK-NEXT: public subscript(x: Swift.Int) -> Swift.Bool {
-  // CHECK-NEXT:   get async
-  // CHECK-NEXT: }
-  // CHECK-NEXT: #endif
-  public subscript(x: Int) -> Bool {
-    @execution(caller)
-    get async {
-      false
-    }
-  }
 }
 

test/attr/attr_execution.swift

@@ -20,22 +20,32 @@ struct Test {
   @execution(concurrent) init() {}
   // expected-error@-1 {{cannot use '@execution' on non-async initializer 'init()'}}
 
+  @execution(concurrent) init(async: Void) async {}
+
   @execution(concurrent) func member() {}
   // expected-error@-1 {{cannot use '@execution' on non-async instance method 'member()'}}
 
   @execution(concurrent) func member() async {} // Ok
 
   // expected-error@+1 {{'@execution(caller)' attribute cannot be applied to this declaration}}
   @execution(caller) subscript(a: Int) -> Bool {
-    get { false }
+    @execution(concurrent) get { false }
+    // expected-error@-1 {{@execution(concurrent)' attribute cannot be applied to this declaration}}
     @execution(concurrent) set { }
-    // expected-error@-1 {{cannot use '@execution' on non-async setter for subscript 'subscript(_:)'}}
+    // expected-error@-1 {{@execution(concurrent)' attribute cannot be applied to this declaration}}
   }
 
   @execution(caller) var x: Int
   // expected-error@-1 {{'@execution(caller)' attribute cannot be applied to this declaration}}
 }
 
+do {
+  class C {
+    @execution(caller) deinit {}
+    // expected-error@-1 {{'@execution(caller)' attribute cannot be applied to this declaration}}
+  }
+}
+
 do {
   @execution(caller) func local() async {} // Ok
 }
@@ -93,21 +103,3 @@ _ = { @execution(concurrent) () -> Int in
 _ = { @execution(caller) (x: isolated (any Actor)?) in
   // expected-error@-1 {{cannot use '@execution' together with an isolated parameter}}
 }
-
-struct TestDifferentPositions {
-  @execution(caller)
-  init() async {
-  }
-
-  var x: Int {
-    @execution(concurrent)
-    get async {
-    }
-  }
-
-  subscript(x: Int) -> Bool {
-    @execution(concurrent)
-    get async {
-    }
-  }
-}