Skip to content

Commit 437c07b

Browse files
committed
---
yaml --- r: 348463 b: refs/heads/master c: 65a70fe h: refs/heads/master i: 348461: b7235ff 348459: b4e040e 348455: 8a700b5 348447: 951799e
1 parent 4df6891 commit 437c07b

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 8c17868afaf157d2b0d551027d8a376af8a80e7f
2+
refs/heads/master: 65a70fe30ef8c5e616221014f18f648fcf0906b2
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Parse/ParseDecl.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4135,8 +4135,10 @@ parseDeclTypeAlias(Parser::ParseDeclOptions Flags, DeclAttributes &Attributes) {
41354135

41364136
Status |= parseIdentifierDeclName(*this, Id, IdLoc, "typealias",
41374137
tok::colon, tok::equal);
4138-
if (Status.isError())
4138+
if (Status.isError()) {
4139+
TmpCtxt->setTransparent();
41394140
return nullptr;
4141+
}
41404142

41414143
DebuggerContextChange DCC(*this, Id, DeclKind::TypeAlias);
41424144

trunk/test/Syntax/round_trip_misc.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ do {
2222
do {
2323
typealias Alias3 = () -> @objc func
2424
}
25+
do {
26+
typealias
27+
}
2528

2629
// Orphan '}' at top level
2730
}

0 commit comments

Comments
 (0)