Emit the correct diagnostics when we constant fold an array size to a negative value.
llvm-svn: 65023
This commit is contained in:
parent
b5d8416b90
commit
0756c97dae
|
@ -3397,11 +3397,14 @@ void Sema::ActOnTagFinishDefinition(Scope *S, DeclTy *TagD) {
|
|||
/// types into constant array types in certain situations which would otherwise
|
||||
/// be errors (for GCC compatibility).
|
||||
static QualType TryToFixInvalidVariablyModifiedType(QualType T,
|
||||
ASTContext &Context) {
|
||||
ASTContext &Context,
|
||||
bool &SizeIsNegative) {
|
||||
// This method tries to turn a variable array into a constant
|
||||
// array even when the size isn't an ICE. This is necessary
|
||||
// for compatibility with code that depends on gcc's buggy
|
||||
// constant expression folding, like struct {char x[(int)(char*)2];}
|
||||
SizeIsNegative = false;
|
||||
|
||||
const VariableArrayType* VLATy = dyn_cast<VariableArrayType>(T);
|
||||
if (!VLATy) return QualType();
|
||||
|
||||
|
@ -3415,6 +3418,8 @@ static QualType TryToFixInvalidVariablyModifiedType(QualType T,
|
|||
if (Res >= llvm::APSInt(Res.getBitWidth(), Res.isUnsigned()))
|
||||
return Context.getConstantArrayType(VLATy->getElementType(),
|
||||
Res, ArrayType::Normal, 0);
|
||||
|
||||
SizeIsNegative = true;
|
||||
return QualType();
|
||||
}
|
||||
|
||||
|
@ -3463,12 +3468,17 @@ Sema::DeclTy *Sema::ActOnField(Scope *S, DeclTy *TagD,
|
|||
// C99 6.7.2.1p8: A member of a structure or union may have any type other
|
||||
// than a variably modified type.
|
||||
if (T->isVariablyModifiedType()) {
|
||||
QualType FixedTy = TryToFixInvalidVariablyModifiedType(T, Context);
|
||||
bool SizeIsNegative;
|
||||
QualType FixedTy = TryToFixInvalidVariablyModifiedType(T, Context,
|
||||
SizeIsNegative);
|
||||
if (!FixedTy.isNull()) {
|
||||
Diag(Loc, diag::warn_illegal_constant_array_size);
|
||||
T = FixedTy;
|
||||
} else {
|
||||
Diag(Loc, diag::err_typecheck_field_variable_size);
|
||||
if (SizeIsNegative)
|
||||
Diag(Loc, diag::err_typecheck_negative_array_size);
|
||||
else
|
||||
Diag(Loc, diag::err_typecheck_field_variable_size);
|
||||
T = Context.IntTy;
|
||||
InvalidDecl = true;
|
||||
}
|
||||
|
|
|
@ -34,3 +34,7 @@ _Complex float g16 = (1.0f + 1.0fi);
|
|||
int g17[(3?:1) - 2];
|
||||
|
||||
EVAL_EXPR(18, ((int)((void*)10 + 10)) == 20 ? 1 : -1);
|
||||
|
||||
struct s {
|
||||
int a[(int)-1.0f]; // expected-error {{array size is negative}}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue