From b3c4906aa62ebe72836f95c9d8306280a5bc6ad0 Mon Sep 17 00:00:00 2001 From: John McCall Date: Wed, 6 Apr 2011 02:35:25 +0000 Subject: [PATCH] Diagnose a missing ')' on what looks like a statement expression. A situation where we can get an invalid ExprResult without an error. Fixes PR8394. Patch by Justin Bogner! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128979 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Parse/ParseExpr.cpp | 7 ++++++- test/Parser/expressions.c | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp index 510e2c2801..d8d73e9239 100644 --- a/lib/Parse/ParseExpr.cpp +++ b/lib/Parse/ParseExpr.cpp @@ -1631,6 +1631,9 @@ Parser::ParseParenExpression(ParenParseOption &ExprType, bool stopIfCastExpr, ConsumeCodeCompletionToken(); return ExprError(); } + + // None of these cases should fall through with an invalid Result + // unless they've already reported an error. if (ExprType >= CompoundStmt && Tok.is(tok::l_brace)) { Diag(Tok, diag::ext_gnu_statement_expr); @@ -1639,7 +1642,7 @@ Parser::ParseParenExpression(ParenParseOption &ExprType, bool stopIfCastExpr, ExprType = CompoundStmt; // If the substmt parsed correctly, build the AST node. - if (!Stmt.isInvalid() && Tok.is(tok::r_paren)) + if (!Stmt.isInvalid()) Result = Actions.ActOnStmtExpr(OpenLoc, Stmt.take(), Tok.getLocation()); } else if (ExprType >= CompoundLiteral && @@ -1737,6 +1740,8 @@ Parser::ParseParenExpression(ParenParseOption &ExprType, bool stopIfCastExpr, Result = ParseExpression(); ExprType = SimpleExpr; + + // Don't build a paren expression unless we actually match a ')'. if (!Result.isInvalid() && Tok.is(tok::r_paren)) Result = Actions.ActOnParenExpr(OpenLoc, Tok.getLocation(), Result.take()); } diff --git a/test/Parser/expressions.c b/test/Parser/expressions.c index 6015e918a3..0d1b6c945c 100644 --- a/test/Parser/expressions.c +++ b/test/Parser/expressions.c @@ -51,3 +51,9 @@ int test6(void) { test5(1) ; // expected-error {{expected ')'}} } + +// PR8394 +void test7() { + ({} // expected-note {{to match}} + ; // expected-error {{expected ')'}} +} -- 2.50.1