forked from OSchip/llvm-project
Microsoft enum extensions. 2 things will change on -fms-extensions:
1. enum underlying type is int by default. 2. Error "enumerator value is not representable in the underlying type"is a ExtWarning llvm-svn: 116704
This commit is contained in:
parent
6769922d8c
commit
a310806ae5
|
@ -839,6 +839,9 @@ def err_enum_invalid_underlying : Error<
|
|||
"non-integral type %0 is an invalid underlying type">;
|
||||
def err_enumerator_too_large : Error<
|
||||
"enumerator value is not representable in the underlying type %0">;
|
||||
def ext_enumerator_too_large : ExtWarn<
|
||||
"enumerator value is not representable in the underlying type %0">,
|
||||
InGroup<Microsoft>;
|
||||
def err_enumerator_wrapped : Error<
|
||||
"enumerator value %0 is not representable in the underlying type %1">;
|
||||
def err_enum_redeclare_type_mismatch : Error<
|
||||
|
|
|
@ -5526,7 +5526,9 @@ Decl *Sema::ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK,
|
|||
// Recover by falling back to int.
|
||||
EnumUnderlying = Context.IntTy.getTypePtr();
|
||||
}
|
||||
}
|
||||
} else if (getLangOptions().Microsoft)
|
||||
// Microsoft enums are always of int type.
|
||||
EnumUnderlying = Context.IntTy.getTypePtr();
|
||||
}
|
||||
|
||||
DeclContext *SearchDC = CurContext;
|
||||
|
@ -7080,10 +7082,14 @@ EnumConstantDecl *Sema::CheckEnumConstant(EnumDecl *Enum,
|
|||
// C++0x [dcl.enum]p5:
|
||||
// ... if the initializing value of an enumerator cannot be
|
||||
// represented by the underlying type, the program is ill-formed.
|
||||
if (!isRepresentableIntegerValue(Context, EnumVal, EltTy))
|
||||
Diag(IdLoc, diag::err_enumerator_too_large)
|
||||
<< EltTy;
|
||||
else
|
||||
if (!isRepresentableIntegerValue(Context, EnumVal, EltTy)) {
|
||||
if (getLangOptions().Microsoft) {
|
||||
Diag(IdLoc, diag::ext_enumerator_too_large) << EltTy;
|
||||
ImpCastExprToType(Val, EltTy, CK_IntegralCast);
|
||||
} else
|
||||
Diag(IdLoc, diag::err_enumerator_too_large)
|
||||
<< EltTy;
|
||||
} else
|
||||
ImpCastExprToType(Val, EltTy, CK_IntegralCast);
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -19,3 +19,15 @@ struct D {
|
|||
int l;
|
||||
int D[];
|
||||
};
|
||||
|
||||
|
||||
enum ENUM1; // expected-warning {{forward references to 'enum' types are a Microsoft extension}}
|
||||
enum ENUM1 var1 = 3;
|
||||
enum ENUM1* var2 = 0;
|
||||
|
||||
|
||||
enum ENUM2 {
|
||||
ENUM2_a = (enum ENUM2) 4,
|
||||
ENUM2_b = 0x9FFFFFFF, // expected-warning {{enumerator value is not representable in the underlying type 'int'}}
|
||||
ENUM2_c = 0x100000000 // expected-warning {{enumerator value is not representable in the underlying type 'int'}}
|
||||
};
|
||||
|
|
|
@ -87,4 +87,13 @@ void m1() {
|
|||
|
||||
//MSVC allows forward enum declaration
|
||||
enum ENUM; // expected-warning {{forward references to 'enum' types are a Microsoft extension}}
|
||||
ENUM *var;
|
||||
ENUM *var = 0;
|
||||
ENUM var2 = (ENUM)3;
|
||||
enum ENUM1* var3 = 0;// expected-warning {{forward references to 'enum' types are a Microsoft extension}}
|
||||
|
||||
|
||||
enum ENUM2 {
|
||||
ENUM2_a = (enum ENUM2) 4,
|
||||
ENUM2_b = 0x9FFFFFFF, // expected-warning {{enumerator value is not representable in the underlying type 'int'}}
|
||||
ENUM2_c = 0x100000000 // expected-warning {{enumerator value is not representable in the underlying type 'int'}}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue