From b5d65e84c9b9f5e9e059ae5c30dd1a3b37c4246f Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Thu, 5 Dec 2013 23:06:53 +0000 Subject: [PATCH] -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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196548 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaStmt.cpp | 4 ++-- test/Sema/warn-outof-range-assign-enum.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 077282c1bf..1d2ebad788 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -1149,7 +1149,7 @@ Sema::DiagnoseAssignmentEnum(QualType DstType, QualType SrcType, return; if (const EnumType *ET = DstType->getAs()) - 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(); } } } diff --git a/test/Sema/warn-outof-range-assign-enum.c b/test/Sema/warn-outof-range-assign-enum.c index 43eea0cef4..edd4e37229 100644 --- a/test/Sema/warn-outof-range-assign-enum.c +++ b/test/Sema/warn-outof-range-assign-enum.c @@ -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'}} } -- 2.40.0