Merge pull request #63215 from ahoppen/ahoppen/effect-specifiers

Adjustments for re-structured effect specifiers

Author: ahoppen

lib/ASTGen/Sources/ASTGen/Types.swift

@@ -135,12 +135,12 @@ extension ASTGenVisitor {
       let lParenLoc = self.base.advanced(by: node.leftParen.position.utf8Offset).raw
       let rParenLoc = self.base.advanced(by: node.rightParen.position.utf8Offset).raw
       let args = TupleTypeRepr_create(self.ctx, elements, lParenLoc, rParenLoc)
-      let asyncLoc = node.asyncKeyword.map { self.base.advanced(by: $0.position.utf8Offset).raw }
-      let throwsLoc = node.throwsOrRethrowsKeyword.map {
+      let asyncLoc = node.effectSpecifiers?.asyncSpecifier.map { self.base.advanced(by: $0.position.utf8Offset).raw }
+      let throwsLoc = node.effectSpecifiers?.throwsSpecifier.map {
         self.base.advanced(by: $0.position.utf8Offset).raw
       }
-      let arrowLoc = self.base.advanced(by: node.arrow.position.utf8Offset).raw
-      let retTy = visit(node.returnType).rawValue
+      let arrowLoc = self.base.advanced(by: node.output.arrow.position.utf8Offset).raw
+      let retTy = visit(node.output.returnType).rawValue
       return .type(FunctionTypeRepr_create(self.ctx, args, asyncLoc, throwsLoc, arrowLoc, retTy))
     }
   }

test/Parse/new_parser_diagnostics.swift

@@ -5,5 +5,5 @@
 // REQUIRES: asserts
 
 _ = [(Int) -> async throws Int]()
-// expected-error@-1{{'async throws' may only occur before '->'}}
+// expected-error@-1{{'async throws' must preceed '->'}}
 // expected-note@-2{{move 'async throws' in front of '->'}}{{15-21=}} {{21-28=}} {{20-21= }} {{12-12=async }} {{12-12=throws }}