Parse Type after seeing and consuming throws

Author: minuscorp

lib/Parse/ParsePattern.cpp

@@ -848,20 +848,20 @@ void Parser::parseAsyncThrows(
       diagnose(Tok, diag::throw_in_function_type)
         .fixItReplace(Tok.getLoc(), "throws");
     }
-
-    StringRef keyword = Tok.getText();
-    throwsLoc = consumeToken();
-    
-    if (!peekToken().isKeyword()) {
-      BacktrackingScope backtrackingScope(*this);
-      if (peekToken().is(tok::kw_throws)) {
-        ASTContext &Ctx = SF.getASTContext();
-        DiagnosticSuppression SuppressedDiags(Ctx.Diags);
-        backtrackingScope.cancelBacktrack();
-        if (canParseType()) {
-          ParserResult<TypeRepr> result = parseType();
-          throwsType = result.getPtrOrNull();
-        }
+    StringRef keyword;
+    if (Tok.isKeyword() && Tok.is(tok::kw_throws)) {
+      keyword = Tok.getText();
+      throwsLoc = consumeToken();
+      ASTContext &Ctx = SF.getASTContext();
+      DiagnosticSuppression SuppressedDiags(Ctx.Diags);
+      bool hasType = false;
+      {
+        BacktrackingScope backtrack(*this);
+        hasType = canParseType();
+      }
+      if (hasType) {
+        ParserResult<TypeRepr> result = parseType();
+        throwsType = result.getPtrOrNull();
       }
     }
 

test/Parse/errors.swift

@@ -42,9 +42,11 @@ func one() {
 
   func foo() throws {}
 
-  struct SomeError: Error {}
+  struct SomeError: Swift.Error {}
 
   func bar() throws SomeError {}
+
+  func baz() throws SomeError -> Int { return 2; }
 
   do {
 #if false