Fix issues after rebase.

vguerra · vguerra · commit eeb0a1f6632b · 2019-10-16T14:46:58.000+02:00
Had to rebase due to revert of syxtax parsing #27675.
diff --git a/lib/Parse/ParsePattern.cpp b/lib/Parse/ParsePattern.cpp
@@ -787,9 +787,9 @@ Parser::parseFunctionSignature(Identifier SimpleName,
     diagnose(throwsLoc, diag::throw_in_function_type)
       .fixItReplace(throwsLoc, "throws");
   } else if (Tok.is(tok::kw_try)) {
-    diagnose(Tok.getLoc(), diag::throw_in_function_type)
-        .fixItReplace(Tok.getLoc(), "throws");
-    ignoreToken();
+    SourceLoc tryLoc = consumeToken();
+    diagnose(tryLoc, diag::throw_in_function_type)
+        .fixItReplace(tryLoc, "throws");
   }
 
   SourceLoc arrowLoc;
diff --git a/lib/Parse/ParseType.cpp b/lib/Parse/ParseType.cpp
@@ -409,9 +409,7 @@ ParserResult<TypeRepr> Parser::parseType(Diag<> MessageID,
       diagnose(Tok.getLoc(), DiagID)
         .fixItReplace(Tok.getLoc(), "throws");
     }
-    if (Tok.isNot(tok::try)) {
-      throwsLoc = consumeToken();
-    }
+    throwsLoc = consumeToken();
   }
 
   if (Tok.is(tok::arrow)) {

Original file line number	Diff line number	Diff line change
`@@ -409,9 +409,7 @@ ParserResult<TypeRepr> Parser::parseType(Diag<> MessageID,`
`409`	`409`	`diagnose(Tok.getLoc(), DiagID)`
`410`	`410`	`.fixItReplace(Tok.getLoc(), "throws");`
`411`	`411`	`}`
`412`		`- if (Tok.isNot(tok::try)) {`
`413`		`- throwsLoc = consumeToken();`
`414`		`- }`
	`412`	`+ throwsLoc = consumeToken();`
`415`	`413`	`}`
`416`	`414`
`417`	`415`	`if (Tok.is(tok::arrow)) {`