summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseExpr.cpp
diff options
context:
space:
mode:
authorErik Pilkington <erik.pilkington@gmail.com>2016-06-13 20:56:45 +0000
committerErik Pilkington <erik.pilkington@gmail.com>2016-06-13 20:56:45 +0000
commit142a87489053e664125909f41cf211b5b45ad628 (patch)
tree167d5f2687680ce1bd755364cde45bafddcb9259 /clang/lib/Parse/ParseExpr.cpp
parentf42103ce8b38a1a534ae08a5f44ec28a8df034fe (diff)
downloadbcm5719-llvm-142a87489053e664125909f41cf211b5b45ad628.tar.gz
bcm5719-llvm-142a87489053e664125909f41cf211b5b45ad628.zip
[Parser] Only correct delayed typos when needed
ActOnBinOp corrects delayed typos when in C mode; don't correct them in that case. Fixes PR26700. Differential Revision: http://reviews.llvm.org/D20490 llvm-svn: 272587
Diffstat (limited to 'clang/lib/Parse/ParseExpr.cpp')
-rw-r--r--clang/lib/Parse/ParseExpr.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index 927bb208c75..4e39d42ea6a 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -446,6 +446,10 @@ Parser::ParseRHSOfBinaryExpression(ExprResult LHS, prec::Level MinPrec) {
LHS = Actions.ActOnBinOp(getCurScope(), OpToken.getLocation(),
OpToken.getKind(), LHS.get(), RHS.get());
+
+ // In this case, ActOnBinOp performed the CorrectDelayedTyposInExpr check.
+ if (!getLangOpts().CPlusPlus)
+ continue;
} else {
LHS = Actions.ActOnConditionalOp(OpToken.getLocation(), ColonLoc,
LHS.get(), TernaryMiddle.get(),
OpenPOWER on IntegriCloud