forked from OSchip/llvm-project
[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 llvm-svn: 359713
This commit is contained in:
parent
0a4aeec16e
commit
31f7c4aa77
|
@ -1582,7 +1582,9 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
|
||||||
|
|
||||||
SourceLocation RLoc = Tok.getLocation();
|
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() &&
|
if (!LHS.isInvalid() && !Idx.isInvalid() && !Length.isInvalid() &&
|
||||||
Tok.is(tok::r_square)) {
|
Tok.is(tok::r_square)) {
|
||||||
if (ColonLoc.isValid()) {
|
if (ColonLoc.isValid()) {
|
||||||
|
@ -1594,12 +1596,6 @@ Parser::ParsePostfixExpressionSuffix(ExprResult LHS) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
LHS = ExprError();
|
LHS = ExprError();
|
||||||
}
|
|
||||||
if (LHS.isInvalid()) {
|
|
||||||
(void)Actions.CorrectDelayedTyposInExpr(OrigLHS);
|
|
||||||
(void)Actions.CorrectDelayedTyposInExpr(Idx);
|
|
||||||
(void)Actions.CorrectDelayedTyposInExpr(Length);
|
|
||||||
LHS = ExprError();
|
|
||||||
Idx = ExprError();
|
Idx = ExprError();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -678,7 +678,7 @@ namespace {
|
||||||
struct a0is0 {};
|
struct a0is0 {};
|
||||||
struct b0is0 {};
|
struct b0is0 {};
|
||||||
int g() {
|
int g() {
|
||||||
0 [ // expected-error {{subscripted value is not an array}}
|
0 [
|
||||||
sizeof(c0is0)]; // expected-error {{use of undeclared identifier}}
|
sizeof(c0is0)]; // expected-error {{use of undeclared identifier}}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue