summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseExpr.cpp
diff options
context:
space:
mode:
authorKaelyn Takata <rikka@google.com>2015-05-02 00:49:18 +0000
committerKaelyn Takata <rikka@google.com>2015-05-02 00:49:18 +0000
commit40055d118548c00f144ef73f947d764e9b6057bc (patch)
treeaad40845b23e75883dc7dc6943f86aa48d58777f /clang/lib/Parse/ParseExpr.cpp
parenta909abfd290fc6159a13c91dd419e7ab959c4146 (diff)
downloadbcm5719-llvm-40055d118548c00f144ef73f947d764e9b6057bc.tar.gz
bcm5719-llvm-40055d118548c00f144ef73f947d764e9b6057bc.zip
Diagnose delayed typos when parsing a postfix expression with an
unmatched l_paren before setting the LHS to ExprError(). Fixes PR23285. llvm-svn: 236371
Diffstat (limited to 'clang/lib/Parse/ParseExpr.cpp')
-rw-r--r--clang/lib/Parse/ParseExpr.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index 9e0060be57e..527351012d9 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -1479,7 +1479,19 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
if (LHS.isInvalid()) {
SkipUntil(tok::r_paren, StopAtSemi);
} else if (Tok.isNot(tok::r_paren)) {
- PT.consumeClose();
+ bool HadDelayedTypo = false;
+ if (Actions.CorrectDelayedTyposInExpr(LHS).get() != LHS.get())
+ HadDelayedTypo = true;
+ for (auto &E : ArgExprs)
+ if (Actions.CorrectDelayedTyposInExpr(E).get() != E)
+ HadDelayedTypo = true;
+ // If there were delayed typos in the LHS or ArgExprs, call SkipUntil
+ // instead of PT.consumeClose() to avoid emitting extra diagnostics for
+ // the unmatched l_paren.
+ if (HadDelayedTypo)
+ SkipUntil(tok::r_paren, StopAtSemi);
+ else
+ PT.consumeClose();
LHS = ExprError();
} else {
assert((ArgExprs.size() == 0 ||
OpenPOWER on IntegriCloud