PR35586: Relax two asserts that are overly restrictive
The two asserts are too aggressive. In C++ mode, an enum is NOT considered an integral type, but an enum value is allowed to be an enum. This patch relaxes the two asserts to allow the enum value as well (as typechecking does). llvm-svn: 320411
This commit is contained in:
parent
049278c86a
commit
bf5fad86db
|
@ -15217,7 +15217,8 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl,
|
|||
static bool isRepresentableIntegerValue(ASTContext &Context,
|
||||
llvm::APSInt &Value,
|
||||
QualType T) {
|
||||
assert(T->isIntegralType(Context) && "Integral type required!");
|
||||
assert((T->isIntegralType(Context) || T->isEnumeralType()) &&
|
||||
"Integral type required!");
|
||||
unsigned BitWidth = Context.getIntWidth(T);
|
||||
|
||||
if (Value.isUnsigned() || Value.isNonNegative()) {
|
||||
|
@ -15233,7 +15234,8 @@ static bool isRepresentableIntegerValue(ASTContext &Context,
|
|||
static QualType getNextLargerIntegralType(ASTContext &Context, QualType T) {
|
||||
// FIXME: Int128/UInt128 support, which also needs to be introduced into
|
||||
// enum checking below.
|
||||
assert(T->isIntegralType(Context) && "Integral type required!");
|
||||
assert((T->isIntegralType(Context) ||
|
||||
T->isEnumeralType()) && "Integral type required!");
|
||||
const unsigned NumTypes = 4;
|
||||
QualType SignedIntegralTypes[NumTypes] = {
|
||||
Context.ShortTy, Context.IntTy, Context.LongTy, Context.LongLongTy
|
||||
|
|
|
@ -309,3 +309,8 @@ namespace test11 {
|
|||
|
||||
bool f() { return !f1(); } // expected-error {{invalid argument type 'test11::E2' (aka 'test11::E') to unary expression}}
|
||||
}
|
||||
|
||||
namespace PR35586 {
|
||||
enum C { R, G, B };
|
||||
enum B { F = (enum C) -1, T}; // this should compile cleanly, it used to assert.
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue