---

yaml
---
r: 342999
b: refs/heads/master-rebranch
c: e609a3a
h: refs/heads/master
i:
  342997: ced7136
  342995: a35ddb7
  342991: 149de45

Author: rintaro

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: dc0cf99b0eef34f1b039a94e2ed32747a66211a6
+refs/heads/master-rebranch: e609a3aaab497ecc92fd4bcc5f582e7e391b4c9e
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/lib/Parse/ParseType.cpp

@@ -550,6 +550,7 @@ Parser::parseGenericArgumentClauseSyntax() {
     auto Type = SyntaxContext->popIf<ParsedTypeSyntax>();
     if (Ty.isParseError() || Ty.hasCodeCompletion()) {
       Junk.push_back(LAngle);
+      Junk.append(Args.begin(), Args.end());
       if (Type)
         Junk.push_back(*Type);
       skipUntilGreaterInTypeListSyntax(Junk);