replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Wassign-enum: compare unqualified types 

This commit changes -Wassign-enum to compare unqualified types.  One could
think that this does not matter much, because who wants a value of enum type
that is const-qualified?  But this breaks the intended pattern to silence this
warning with an explicit cast:

    static const enum Foo z = (enum Foo) 42;

In this case, source type is 'enum Foo', and destination type is 'const enum
Foo', and if we compare qualified types, they don't match, so we used warn.

llvm-svn: 196548
This commit is contained in:
Dmitri Gribenko 2013-12-05 23:06:53 +00:00
parent 00fe87b488
commit e6ac50ad71
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Sema/SemaStmt.cpp
View File

@ -1149,7 +1149,7 @@ Sema::DiagnoseAssignmentEnum(QualType DstType, QualType SrcType,
return;
if (const EnumType *ET = DstType->getAs<EnumType>())
if (!Context.hasSameType(SrcType, DstType) &&
if (!Context.hasSameUnqualifiedType(SrcType, DstType) &&
SrcType->isIntegerType()) {
if (!SrcExpr->isTypeDependent() && !SrcExpr->isValueDependent() &&
SrcExpr->isIntegerConstantExpr(Context)) {
@ -1184,7 +1184,7 @@ Sema::DiagnoseAssignmentEnum(QualType DstType, QualType SrcType,
EI++;
if (EI == EIend || EI->first != RhsVal) {
Diag(SrcExpr->getExprLoc(), diag::warn_not_in_enum_assignment)
<< DstType;
<< DstType.getUnqualifiedType();
}
}
}

18
clang/test/Sema/warn-outof-range-assign-enum.c
View File

@ -11,6 +11,24 @@ typedef enum CCTestEnum
CCTestEnum test = 50; // expected-warning {{integer constant not in range of enumerated type 'CCTestEnum'}}
CCTestEnum test1 = -50; // expected-warning {{integer constant not in range of enumerated type 'CCTestEnum'}}
// Explicit cast should silence the warning.
static const CCTestEnum SilenceWithCast1 = 51; // expected-warning {{integer constant not in range of enumerated type 'CCTestEnum'}}
static const CCTestEnum SilenceWithCast2 = (CCTestEnum) 51; // no-warning
static const CCTestEnum SilenceWithCast3 = (const CCTestEnum) 51; // no-warning
static const CCTestEnum SilenceWithCast4 = (const volatile CCTestEnum) 51; // no-warning
void SilenceWithCastLocalVar() {
CCTestEnum SilenceWithCast1 = 51; // expected-warning {{integer constant not in range of enumerated type 'CCTestEnum'}}
CCTestEnum SilenceWithCast2 = (CCTestEnum) 51; // no-warning
CCTestEnum SilenceWithCast3 = (const CCTestEnum) 51; // no-warning
CCTestEnum SilenceWithCast4 = (const volatile CCTestEnum) 51; // no-warning
const CCTestEnum SilenceWithCast1c = 51; // expected-warning {{integer constant not in range of enumerated type 'CCTestEnum'}}
const CCTestEnum SilenceWithCast2c = (CCTestEnum) 51; // no-warning
const CCTestEnum SilenceWithCast3c = (const CCTestEnum) 51; // no-warning
const CCTestEnum SilenceWithCast4c = (const volatile CCTestEnum) 51; // no-warning
}
CCTestEnum foo(CCTestEnum r) {
return 20; // expected-warning {{integer constant not in range of enumerated type 'CCTestEnum'}}
}