commit c919f5f96459f5ca9ec3a8e902e3451eeae9648a
author David Majnemer <david.majnemer@gmail.com> Fri Feb 19 07:15:33 2016 +0000
committer David Majnemer <david.majnemer@gmail.com> Fri Feb 19 07:15:33 2016 +0000
tree 48258da2aa500354b4627d4f67863c486ff43156
parent 5eeb41c173738cbde5b2b9df3301b558207b9271

Correct typos after acting on invalid subscript expressions

llvm-svn: 261312

clang/lib/Parse/ParseExpr.cpp

diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index 32262f4..07f7505 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -1434,8 +1434,10 @@
 
       // Reject array indices starting with a lambda-expression. '[[' is
       // reserved for attributes.
-      if (CheckProhibitedCXX11Attribute())
+      if (CheckProhibitedCXX11Attribute()) {
+        (void)Actions.CorrectDelayedTyposInExpr(LHS);
         return ExprError();
+      }
 
       BalancedDelimiterTracker T(*this, tok::l_square);
       T.consumeOpen();
@@ -1463,6 +1465,7 @@
 
       SourceLocation RLoc = Tok.getLocation();
 
+      ExprResult OrigLHS = LHS;
       if (!LHS.isInvalid() && !Idx.isInvalid() && !Length.isInvalid() &&
           Tok.is(tok::r_square)) {
         if (ColonLoc.isValid()) {
@@ -1473,7 +1476,10 @@
                                                 Idx.get(), RLoc);
         }
       } else {
-        (void)Actions.CorrectDelayedTyposInExpr(LHS);
+        LHS = ExprError();
+      }
+      if (LHS.isInvalid()) {
+        (void)Actions.CorrectDelayedTyposInExpr(OrigLHS);
         (void)Actions.CorrectDelayedTyposInExpr(Idx);
         (void)Actions.CorrectDelayedTyposInExpr(Length);
         LHS = ExprError();