Author: vsapsai Date: Wed May 1 12:24:50 2019 New Revision: 359713 URL: http://llvm.org/viewvc/llvm-project?rev=359713&view=rev Log: [Parser] Avoid correcting delayed typos in array subscript multiple times.
We correct some typos in `ActOnArraySubscriptExpr` and `ActOnOMPArraySectionExpr`, so when their result is `ExprError`, we can end up correcting delayed typos in the same expressions again. In general it is OK but when `NumTypos` is incorrect, we can hit the assertion > Assertion failed: (Entry != DelayedTypos.end() && "Failed to get the state > for a TypoExpr!"), function getTypoExprState, file > clang/lib/Sema/SemaLookup.cpp, line 5219. Fix by replacing some subscript `ExprResult` with typo-corrected expressions instead of keeping the original expressions. Thus if original expressions contained `TypoExpr`, we'll use corrected expressions instead of trying to correct them again. rdar://problem/47403222 Reviewers: rsmith, erik.pilkington, majnemer Reviewed By: erik.pilkington Subscribers: jkorous, dexonsmith, cfe-commits Differential Revision: https://reviews.llvm.org/D60848 Added: cfe/trunk/test/SemaObjC/typo-correction-subscript.m Modified: cfe/trunk/lib/Parse/ParseExpr.cpp cfe/trunk/test/SemaCXX/typo-correction.cpp Modified: cfe/trunk/lib/Parse/ParseExpr.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=359713&r1=359712&r2=359713&view=diff ============================================================================== --- cfe/trunk/lib/Parse/ParseExpr.cpp (original) +++ cfe/trunk/lib/Parse/ParseExpr.cpp Wed May 1 12:24:50 2019 @@ -1582,7 +1582,9 @@ Parser::ParsePostfixExpressionSuffix(Exp SourceLocation RLoc = Tok.getLocation(); - ExprResult OrigLHS = LHS; + LHS = Actions.CorrectDelayedTyposInExpr(LHS); + Idx = Actions.CorrectDelayedTyposInExpr(Idx); + Length = Actions.CorrectDelayedTyposInExpr(Length); if (!LHS.isInvalid() && !Idx.isInvalid() && !Length.isInvalid() && Tok.is(tok::r_square)) { if (ColonLoc.isValid()) { @@ -1594,12 +1596,6 @@ Parser::ParsePostfixExpressionSuffix(Exp } } else { LHS = ExprError(); - } - if (LHS.isInvalid()) { - (void)Actions.CorrectDelayedTyposInExpr(OrigLHS); - (void)Actions.CorrectDelayedTyposInExpr(Idx); - (void)Actions.CorrectDelayedTyposInExpr(Length); - LHS = ExprError(); Idx = ExprError(); } Modified: cfe/trunk/test/SemaCXX/typo-correction.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/typo-correction.cpp?rev=359713&r1=359712&r2=359713&view=diff ============================================================================== --- cfe/trunk/test/SemaCXX/typo-correction.cpp (original) +++ cfe/trunk/test/SemaCXX/typo-correction.cpp Wed May 1 12:24:50 2019 @@ -678,7 +678,7 @@ namespace { struct a0is0 {}; struct b0is0 {}; int g() { - 0 [ // expected-error {{subscripted value is not an array}} + 0 [ sizeof(c0is0)]; // expected-error {{use of undeclared identifier}} }; } Added: cfe/trunk/test/SemaObjC/typo-correction-subscript.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/typo-correction-subscript.m?rev=359713&view=auto ============================================================================== --- cfe/trunk/test/SemaObjC/typo-correction-subscript.m (added) +++ cfe/trunk/test/SemaObjC/typo-correction-subscript.m Wed May 1 12:24:50 2019 @@ -0,0 +1,15 @@ +// RUN: %clang_cc1 -triple i386-apple-macosx10.10 -fobjc-arc -fsyntax-only -Wno-objc-root-class %s -verify -disable-free + +@class Dictionary; + +@interface Test +@end +@implementation Test +// rdar://problem/47403222 +- (void)rdar47403222:(Dictionary *)opts { + [self undeclaredMethod:undeclaredArg]; + // expected-error@-1{{no visible @interface for 'Test' declares the selector 'undeclaredMethod:'}} + opts[(__bridge id)undeclaredKey] = 0; + // expected-error@-1{{use of undeclared identifier 'undeclaredKey'}} +} +@end _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
