Fixed misc. issues raised by Chris L. on @synchronized implementation.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46558 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Parse/ParseObjc.cpp b/Parse/ParseObjc.cpp
index 41cab3b..4f7afb7 100644
--- a/Parse/ParseObjc.cpp
+++ b/Parse/ParseObjc.cpp
@@ -1110,26 +1110,29 @@
}
/// objc-synchronized-statement:
-/// @synchronized '(' expression ')'
+/// @synchronized '(' expression ')' compound-statement
///
Parser::StmtResult Parser::ParseObjCSynchronizedStmt(SourceLocation atLoc) {
- ExprResult Res;
ConsumeToken(); // consume synchronized
if (Tok.isNot(tok::l_paren)) {
Diag (Tok, diag::err_expected_lparen_after, "@synchronized");
return true;
}
ConsumeParen(); // '('
- Res = ParseExpression();
+ ExprResult Res = ParseExpression();
if (Res.isInvalid) {
SkipUntil(tok::semi);
return true;
}
if (Tok.isNot(tok::r_paren)) {
- Diag (Tok, diag::err_expected_rparen);
+ Diag (Tok, diag::err_expected_lbrace);
return true;
}
ConsumeParen(); // ')'
+ if (Tok.isNot(tok::l_brace)) {
+ Diag (Tok, diag::err_expected_lbrace);
+ return true;
+ }
StmtResult SynchBody = ParseCompoundStatementBody();
if (SynchBody.isInvalid)
SynchBody = Actions.ActOnNullStmt(Tok.getLocation());