Merge pull request #80032 from xedin/expand-scope-of-execution-attr

[AST/Sema] Allow `@execution(...)` attribute to be used on initializers and accessors

Author: xedin

include/swift/AST/DeclAttr.def

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

lib/AST/FeatureSet.cpp

@@ -466,6 +466,12 @@ 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;
 

lib/Sema/TypeCheckAttr.cpp

@@ -257,7 +257,7 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
 
 public:
   void visitExecutionAttr(ExecutionAttr *attr) {
-    auto *F = dyn_cast<FuncDecl>(D);
+    auto *F = dyn_cast<AbstractFunctionDecl>(D);
     if (!F)
       return;
 

test/IDE/complete_decl_attribute_feature_requirement.swift

@@ -63,7 +63,7 @@ struct _S {
   @#^ON_INIT^# init()
 // ON_INIT:              Begin completions
 // ON_INIT_ENABLED-DAG:  Keyword/None:              abi[#Constructor Attribute#]; name=abi
-// ON_INIT_ENABLED-NOT:  Keyword/None:              execution[#{{.*}} Attribute#]; name=execution
+// ON_INIT_ENABLED-DAG:  Keyword/None:              execution[#{{.*}} Attribute#]; name=execution
 // ON_INIT_DISABLED-NOT: Keyword/None:              abi[#{{.*}} Attribute#]; name=abi
 // ON_INIT_DISABLED-NOT: Keyword/None:              execution[#{{.*}} Attribute#]; name=execution
 // ON_INIT:              End completions

test/ModuleInterface/execution_attr.swift

@@ -6,6 +6,15 @@
 // REQUIRES: swift_feature_ExecutionAttribute
 
 public struct Test {
+  // CHECK:  #if compiler(>=5.3) && $ExecutionAttribute
+  // CHECK-NEXT:  @execution(caller) public init() async
+  // CHECK-NEXT:  #else
+  // CHECK-NEXT:  public init() async
+  // CHECK-NEXT:  #endif
+  @execution(caller)
+  public init() async {
+  }
+
   // CHECK:  #if compiler(>=5.3) && $ExecutionAttribute
   // CHECK-NEXT:  @execution(concurrent) public func test() async
   // CHECK-NEXT:  #else
@@ -21,5 +30,37 @@ 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

@@ -18,22 +18,22 @@
 
 struct Test {
   @execution(concurrent) init() {}
-  // expected-error@-1 {{@execution(concurrent) may only be used on 'func' declarations}}
+  // expected-error@-1 {{cannot use '@execution' on non-async initializer 'init()'}}
 
   @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) may only be used on 'func' declarations}}
+  // expected-error@+1 {{'@execution(caller)' attribute cannot be applied to this declaration}}
   @execution(caller) subscript(a: Int) -> Bool {
     get { false }
     @execution(concurrent) set { }
-    // expected-error@-1 {{@execution(concurrent) may only be used on 'func' declarations}}
+    // expected-error@-1 {{cannot use '@execution' on non-async setter for subscript 'subscript(_:)'}}
   }
 
   @execution(caller) var x: Int
-  // expected-error@-1 {{@execution(caller) may only be used on 'func' declarations}}
+  // expected-error@-1 {{'@execution(caller)' attribute cannot be applied to this declaration}}
 }
 
 do {
@@ -93,3 +93,21 @@ _ = { @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 {
+    }
+  }
+}