Merge main into release/6.2

.github/workflows/publish_release.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: |
-          if [[ "${{ github.triggering_actor }}" != "ahoppen" ]]; then
+          if [[ "${{ github.triggering_actor }}" != "bnbarham" ]]; then
             echo "${{ github.triggering_actor }} is not allowed to create a release"
             exit 1
           fi

.github/workflows/pull_request.yml

@@ -1,5 +1,7 @@
 name: Pull request
 
+# PRs created by GitHub Actions don't kick off further actions (https://github.com/peter-evans/create-pull-request/blob/d57e551ebc1a16dee0b8c9ea6d24dba7627a6e35/docs/concepts-guidelines.md#triggering-further-workflow-runs).
+# As a workaround, we mark automerge PRs that are created by GitHub actions as draft and trigger the GitHub actions by marking the PR as ready for review. We'd prefer not re-triggering testing on a normal user's PR in this case, but skipping them causes the checks to reset.
 on:
   pull_request:
     types: [opened, reopened, synchronize, ready_for_review]
@@ -11,20 +13,15 @@ concurrency:
 jobs:
   tests:
     name: Test
-    # PRs created by GitHub Actions don't kick off further actions (https://github.com/peter-evans/create-pull-request/blob/d57e551ebc1a16dee0b8c9ea6d24dba7627a6e35/docs/concepts-guidelines.md#triggering-further-workflow-runs).
-    # As a workaround, we mark automerge PRs that are created by GitHub actions as draft and trigger the GitHub actions by marking the PR as ready for review. But we don't want to re-trigger testing this when a normal user's PR is marked as ready for review.
-    if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
   soundness:
     name: Soundness
-    if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
       api_breakage_check_enabled: false  # https://github.com/swiftlang/swift-syntax/issues/3010
       docs_check_additional_arguments: "--disable-parameters-and-returns-validation"
   verify_source_code:
     name: Validate generated code
-    if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
     runs-on: ubuntu-latest
     container:
       image: swift:latest
@@ -37,7 +34,6 @@ jobs:
         run: "./swift-syntax-dev-utils verify-source-code --toolchain /usr"
   test_using_swift_syntax_dev_utils_linux:
     name: Run tests using swift-syntax-dev-utils (Linux)
-    if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
     runs-on: ubuntu-latest
     container:
       image: swift:latest
@@ -50,7 +46,6 @@ jobs:
         run: "./swift-syntax-dev-utils test --enable-rawsyntax-validation --enable-test-fuzzing --toolchain /usr"
   test_using_swift_syntax_dev_utils_windows:
     name: Run tests using swift-syntax-dev-utils (Windows)
-    if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
     runs-on: windows-2022
     steps:
       - name: Pull Docker image

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -122,8 +122,7 @@ public let ATTRIBUTE_NODES: [Node] = [
           Child(
             name: "abiArguments",
             // Special arguments for declaration syntax. e.g. @abi(func abiName() -> Int)
-            kind: .node(kind: .abiAttributeArguments),
-            experimentalFeature: .abiAttribute
+            kind: .node(kind: .abiAttributeArguments)
           ),
         ]),
         documentation: """
@@ -256,7 +255,6 @@ public let ATTRIBUTE_NODES: [Node] = [
   Node(
     kind: .abiAttributeArguments,
     base: .syntax,
-    experimentalFeature: .abiAttribute,
     nameForDiagnostics: "ABI-providing declaration",
     documentation: "The arguments of the '@abi' attribute",
     children: [

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

@@ -19,7 +19,6 @@ public enum ExperimentalFeature: String, CaseIterable {
   case nonescapableTypes
   case trailingComma
   case coroutineAccessors
-  case abiAttribute
   case keypathWithMethodMembers
   case oldOwnershipOperatorSpellings
   case inlineArrayTypeSugar
@@ -39,8 +38,6 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "TrailingComma"
     case .coroutineAccessors:
       return "CoroutineAccessors"
-    case .abiAttribute:
-      return "ABIAttribute"
     case .keypathWithMethodMembers:
       return "KeypathWithMethodMembers"
     case .oldOwnershipOperatorSpellings:
@@ -65,8 +62,6 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "trailing commas"
     case .coroutineAccessors:
       return "coroutine accessors"
-    case .abiAttribute:
-      return "@abi attribute"
     case .keypathWithMethodMembers:
       return "keypaths with method members"
     case .oldOwnershipOperatorSpellings:

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -357,7 +357,7 @@ public enum Keyword: CaseIterable {
     case ._version:
       return KeywordSpec("_version")
     case .abi:
-      return KeywordSpec("abi", experimentalFeature: .abiAttribute)
+      return KeywordSpec("abi")
     case .accesses:
       return KeywordSpec("accesses")
     case .actor:

Sources/SwiftParser/Attributes.swift

@@ -230,9 +230,9 @@ extension Parser {
     switch peek(isAtAnyIn: DeclarationAttributeWithSpecialSyntax.self) {
     case .abi:
       return parseAttribute(argumentMode: .required) { parser in
-        return parser.parseABIAttributeArguments()
+        return (nil, .abiArguments(parser.parseABIAttributeArguments()))
       } parseMissingArguments: { parser in
-        return parser.parseABIAttributeArguments(missingLParen: true)
+        return (nil, .abiArguments(parser.parseABIAttributeArguments(missingLParen: true)))
       }
     case .available, ._spi_available:
       return parseAttribute(argumentMode: .required) { parser in
@@ -794,9 +794,9 @@ extension Parser {
   /// - Parameter missingLParen: `true` if the opening paren for the argument list was missing.
   mutating func parseABIAttributeArguments(
     missingLParen: Bool = false
-  ) -> (RawUnexpectedNodesSyntax?, RawAttributeSyntax.Arguments) {
-    func makeMissingProviderArguments(unexpectedBefore: [RawSyntax]) -> RawAttributeSyntax.Arguments {
-      let args = RawABIAttributeArgumentsSyntax(
+  ) -> RawABIAttributeArgumentsSyntax {
+    func makeMissingProviderArguments(unexpectedBefore: [RawSyntax]) -> RawABIAttributeArgumentsSyntax {
+      return RawABIAttributeArgumentsSyntax(
         provider: .missing(
           RawMissingDeclSyntax(
             unexpectedBefore.isEmpty ? nil : RawUnexpectedNodesSyntax(elements: unexpectedBefore, arena: self.arena),
@@ -808,7 +808,6 @@ extension Parser {
         ),
         arena: self.arena
       )
-      return .abiArguments(args)
     }
 
     // Consider the three kinds of mistakes we might see here:
@@ -824,23 +823,16 @@ extension Parser {
     // In lieu of that, we judge that recovering gracefully from #3 is more important than #2 and therefore do not even
     // attempt to parse the argument unless we've seen a left paren.
     guard !missingLParen && !self.at(.rightParen) else {
-      return (nil, makeMissingProviderArguments(unexpectedBefore: []))
+      return makeMissingProviderArguments(unexpectedBefore: [])
     }
 
     let decl = parseDeclaration(in: .argumentList)
 
-    guard experimentalFeatures.contains(.abiAttribute) else {
-      return (
-        RawUnexpectedNodesSyntax([decl], arena: self.arena),
-        .argumentList(RawLabeledExprListSyntax(elements: [], arena: self.arena))
-      )
-    }
-
     guard let provider = RawABIAttributeArgumentsSyntax.Provider(decl) else {
-      return (nil, makeMissingProviderArguments(unexpectedBefore: [decl.raw]))
+      return makeMissingProviderArguments(unexpectedBefore: [decl.raw])
     }
 
-    return (nil, .abiArguments(RawABIAttributeArgumentsSyntax(provider: provider, arena: self.arena)))
+    return RawABIAttributeArgumentsSyntax(provider: provider, arena: self.arena)
   }
 }