---

nkcsgexi · web-flow · commit 9c949d2ce074 · 2019-09-03T11:46:39.000-07:00
yaml --- r: 343422 b: refs/heads/master-rebranch c: 0a67fd5 h: refs/heads/master
diff --git a/[refs] b/[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: 115569f0deccfc5baed8fa8147455c69fbecb3af
+refs/heads/master-rebranch: 0a67fd51ba34cfd23c708a77bb4cb8118ec05fe3
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
diff --git a/branches/master-rebranch/lib/Parse/ParseDecl.cpp b/branches/master-rebranch/lib/Parse/ParseDecl.cpp
@@ -4135,8 +4135,10 @@ parseDeclTypeAlias(Parser::ParseDeclOptions Flags, DeclAttributes &Attributes) {
 
   Status |= parseIdentifierDeclName(*this, Id, IdLoc, "typealias",
                                     tok::colon, tok::equal);
-  if (Status.isError())
+  if (Status.isError()) {
+    TmpCtxt->setTransparent();
     return nullptr;
+  }
     
   DebuggerContextChange DCC(*this, Id, DeclKind::TypeAlias);
 
diff --git a/branches/master-rebranch/test/Syntax/round_trip_misc.swift b/branches/master-rebranch/test/Syntax/round_trip_misc.swift
@@ -22,6 +22,9 @@ do {
 do {
   typealias Alias3 = () -> @objc func
 }
+do {
+  typealias
+}
 
 // Orphan '}' at top level
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ do {`
`22`	`22`	`do {`
`23`	`23`	`typealias Alias3 = () -> @objc func`
`24`	`24`	`}`
	`25`	`+do {`
	`26`	`+ typealias`
	`27`	`+}`
`25`	`28`
`26`	`29`	`// Orphan '}' at top level`
`27`	`30`	`}`