diff options
| -rw-r--r-- | lib/Parse/ParseObjc.cpp | 4 | ||||
| -rw-r--r-- | test/Parser/objc-boxing.m | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index ad95dd5821..4adba4f5c5 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -2747,7 +2747,9 @@ ExprResult Parser::ParseObjCDictionaryLiteral(SourceLocation AtLoc) { if (Tok.is(tok::colon)) { ConsumeToken(); } else { - return ExprError(Diag(Tok, diag::err_expected_colon)); + Diag(Tok, diag::err_expected_colon); + SkipUntil(tok::r_brace); + return ExprError(); } ExprResult ValueExpr(ParseAssignmentExpression()); diff --git a/test/Parser/objc-boxing.m b/test/Parser/objc-boxing.m index a16a137b8f..a6bb0243cf 100644 --- a/test/Parser/objc-boxing.m +++ b/test/Parser/objc-boxing.m @@ -24,3 +24,11 @@ id missing_parentheses() { return @(5; // expected-error {{expected ')'}} \ // expected-note {{to match this '('}} } + +// rdar://10679157 +void bar(id p); +void foo(id p) { + bar(@{p, p}); // expected-error {{expected ':'}} + bar(0); + bar(0); +} |