forked from OSchip/llvm-project
PR23057: Fix assertion `Val && "isa<> used on a null pointer"' on invalid for-range expression.
Fix the issue discovered by fuzzing (PR23057, comment 18) by handling nullptr in Sema::ActOnCXXForRangeDecl and correct delayed typos in for-range expression before calling Sema::ActOnCXXForRangeStmt. Also fixes PR26288. Differential Revision: http://reviews.llvm.org/D16630 llvm-svn: 259532
This commit is contained in:
parent
abf22eb544
commit
7d6b924df8
|
@ -1716,9 +1716,11 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) {
|
||||||
StmtResult ForEachStmt;
|
StmtResult ForEachStmt;
|
||||||
|
|
||||||
if (ForRange) {
|
if (ForRange) {
|
||||||
|
ExprResult CorrectedRange =
|
||||||
|
Actions.CorrectDelayedTyposInExpr(ForRangeInit.RangeExpr.get());
|
||||||
ForRangeStmt = Actions.ActOnCXXForRangeStmt(
|
ForRangeStmt = Actions.ActOnCXXForRangeStmt(
|
||||||
getCurScope(), ForLoc, CoawaitLoc, FirstPart.get(),
|
getCurScope(), ForLoc, CoawaitLoc, FirstPart.get(),
|
||||||
ForRangeInit.ColonLoc, ForRangeInit.RangeExpr.get(),
|
ForRangeInit.ColonLoc, CorrectedRange.get(),
|
||||||
T.getCloseLocation(), Sema::BFRK_Build);
|
T.getCloseLocation(), Sema::BFRK_Build);
|
||||||
|
|
||||||
// Similarly, we need to do the semantic analysis for a for-range
|
// Similarly, we need to do the semantic analysis for a for-range
|
||||||
|
|
|
@ -9928,6 +9928,10 @@ void Sema::ActOnUninitializedDecl(Decl *RealDecl,
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sema::ActOnCXXForRangeDecl(Decl *D) {
|
void Sema::ActOnCXXForRangeDecl(Decl *D) {
|
||||||
|
// If there is no declaration, there was an error parsing it. Ignore it.
|
||||||
|
if (!D)
|
||||||
|
return;
|
||||||
|
|
||||||
VarDecl *VD = dyn_cast<VarDecl>(D);
|
VarDecl *VD = dyn_cast<VarDecl>(D);
|
||||||
if (!VD) {
|
if (!VD) {
|
||||||
Diag(D->getLocation(), diag::err_for_range_decl_must_be_var);
|
Diag(D->getLocation(), diag::err_for_range_decl_must_be_var);
|
||||||
|
|
|
@ -18,6 +18,9 @@ void f() {
|
||||||
for (struct S { S(int) {} } s : arr) { // expected-error {{types may not be defined in a for range declaration}}
|
for (struct S { S(int) {} } s : arr) { // expected-error {{types may not be defined in a for range declaration}}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (struct S { S(int) {} } s : Undeclared); // expected-error{{types may not be defined in a for range declaration}}
|
||||||
|
// expected-error@-1{{use of undeclared identifier 'Undeclared'}}
|
||||||
|
|
||||||
new struct T {}; // expected-error {{'T' cannot be defined in a type specifier}}
|
new struct T {}; // expected-error {{'T' cannot be defined in a type specifier}}
|
||||||
new struct A {}; // expected-error {{'A' cannot be defined in a type specifier}}
|
new struct A {}; // expected-error {{'A' cannot be defined in a type specifier}}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s
|
||||||
|
|
||||||
|
// From PR23057 comment #18 (https://llvm.org/bugs/show_bug.cgi?id=23057#c18).
|
||||||
|
|
||||||
|
namespace N {
|
||||||
|
int X[10]; // expected-note{{declared here}}}}
|
||||||
|
}
|
||||||
|
|
||||||
|
void f1() {
|
||||||
|
for (auto operator new : X); // expected-error{{'operator new' cannot be the name of a variable or data member}}
|
||||||
|
// expected-error@-1{{use of undeclared identifier 'X'; did you mean 'N::X'?}}
|
||||||
|
}
|
||||||
|
|
||||||
|
void f2() {
|
||||||
|
for (a operator== :) // expected-error{{'operator==' cannot be the name of a variable or data member}}
|
||||||
|
// expected-error@-1{{expected expression}}
|
||||||
|
// expected-error@-2{{unknown type name 'a'}}
|
||||||
|
} // expected-error{{expected statement}}
|
Loading…
Reference in New Issue