commit 142a87489053e664125909f41cf211b5b45ad628
author Erik Pilkington <erik.pilkington@gmail.com> Mon Jun 13 20:56:45 2016 +0000
committer Erik Pilkington <erik.pilkington@gmail.com> Mon Jun 13 20:56:45 2016 +0000
tree 167d5f2687680ce1bd755364cde45bafddcb9259
parent f42103ce8b38a1a534ae08a5f44ec28a8df034fe

[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

clang/lib/Parse/ParseExpr.cpp

diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index 927bb20..4e39d42 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -446,6 +446,10 @@
 
         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(),