From 74973037ebfc7d071c32e4dcfde822c411274a44 Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Sat, 9 Sep 2017 00:25:05 +0000 Subject: [PATCH] Catch more cases with -Wenum-compare Treat typedef enum as named enums instead of anonymous enums. Anonymous enums are ignored by the warning, so previously, typedef enums were ignored as well. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@312842 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 6 +++-- lib/Sema/SemaStmt.cpp | 6 +++-- test/SemaCXX/warn-enum-compare.cpp | 43 ++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 44b05e1658..a2f5569e70 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -9151,9 +9151,11 @@ static void checkEnumComparison(Sema &S, SourceLocation Loc, Expr *LHS, return; // Ignore anonymous enums. - if (!LHSEnumType->getDecl()->getIdentifier()) + if (!LHSEnumType->getDecl()->getIdentifier() && + !LHSEnumType->getDecl()->getTypedefNameForAnonDecl()) return; - if (!RHSEnumType->getDecl()->getIdentifier()) + if (!RHSEnumType->getDecl()->getIdentifier() && + !RHSEnumType->getDecl()->getTypedefNameForAnonDecl()) return; if (S.Context.hasSameUnqualifiedType(LHSStrippedType, RHSStrippedType)) diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 2e1ea3e2f6..3a3eb5e7b5 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -754,9 +754,11 @@ static void checkEnumTypesInSwitchStmt(Sema &S, const Expr *Cond, return; // Ignore anonymous enums. - if (!CondEnumType->getDecl()->getIdentifier()) + if (!CondEnumType->getDecl()->getIdentifier() && + !CondEnumType->getDecl()->getTypedefNameForAnonDecl()) return; - if (!CaseEnumType->getDecl()->getIdentifier()) + if (!CaseEnumType->getDecl()->getIdentifier() && + !CaseEnumType->getDecl()->getTypedefNameForAnonDecl()) return; if (S.Context.hasSameUnqualifiedType(CondType, CaseType)) diff --git a/test/SemaCXX/warn-enum-compare.cpp b/test/SemaCXX/warn-enum-compare.cpp index 0d7558dba7..95107a0146 100644 --- a/test/SemaCXX/warn-enum-compare.cpp +++ b/test/SemaCXX/warn-enum-compare.cpp @@ -4,6 +4,8 @@ enum Foo { FooA, FooB, FooC }; enum Bar { BarD, BarE, BarF }; enum { AnonAA = 42, AnonAB = 43 }; enum { AnonBA = 44, AnonBB = 45 }; +enum { Anon1, Anon2, Anon3 }; +typedef enum { TD1, TD2 } TD; namespace name1 { enum Foo {F1, F2, F3}; @@ -29,6 +31,7 @@ void test () { name1::Foo a; oneFoo b; twoFoo c; + TD td; while (x == FooA); while (y == BarD); @@ -65,6 +68,9 @@ void test () { while ((((((B1))))) == (((name1::B2)))); while (B2 == ((((((name2::B1))))))); + while (td == Anon1); + while (td == AnonAA); // expected-warning {{comparison of constant 'AnonAA' (42) with expression of type 'TD' is always false}} + while (B1 == B2); // expected-warning {{comparison of two values with different enumeration types ('name1::Baz' and 'name2::Baz')}} while (name1::B2 == name2::B3); // expected-warning {{comparison of two values with different enumeration types ('name1::Baz' and 'name2::Baz')}} while (z == name2::B2); // expected-warning {{comparison of two values with different enumeration types ('name1::Baz' and 'name2::Baz')}} @@ -209,6 +215,24 @@ void test () { while (getBar() > x); // expected-warning {{comparison of two values with different enumeration types ('Bar' and 'Foo')}} while (getBar() < x); // expected-warning {{comparison of two values with different enumeration types ('Bar' and 'Foo')}} + while (td == FooA); // expected-warning {{comparison of two values with different enumeration types ('TD' and 'Foo')}} + while (td == BarD); // expected-warning {{comparison of two values with different enumeration types ('TD' and 'Bar')}} + while (name1::F1 == td); // expected-warning {{comparison of two values with different enumeration types ('name1::Foo' and 'TD')}} + while (name2::B1 == td); // expected-warning {{comparison of two values with different enumeration types ('name2::Baz' and 'TD')}} + while (td == a); // expected-warning {{comparison of two values with different enumeration types ('TD' and 'name1::Foo')}} + while (td == b); // expected-warning {{comparison of two values with different enumeration types ('TD' and 'oneFoo' (aka 'name1::Foo'))}} + while (td == c); // expected-warning {{comparison of two values with different enumeration types ('TD' and 'twoFoo' (aka 'name1::Foo'))}} + while (td == x); // expected-warning {{comparison of two values with different enumeration types ('TD' and 'Foo')}} + while (td == y); // expected-warning {{comparison of two values with different enumeration types ('TD' and 'Bar')}} + while (td == z); // expected-warning {{comparison of two values with different enumeration types ('TD' and 'name1::Baz')}} + + while (a == TD1); // expected-warning {{comparison of two values with different enumeration types ('name1::Foo' and 'TD')}} + while (b == TD2); // expected-warning {{comparison of two values with different enumeration types ('oneFoo' (aka 'name1::Foo') and 'TD')}} + while (c == TD1); // expected-warning {{comparison of two values with different enumeration types ('twoFoo' (aka 'name1::Foo') and 'TD')}} + while (x == TD2); // expected-warning {{comparison of two values with different enumeration types ('Foo' and 'TD')}} + while (y == TD1); // expected-warning {{comparison of two values with different enumeration types ('Bar' and 'TD')}} + while (z == TD2); // expected-warning {{comparison of two values with different enumeration types ('name1::Baz' and 'TD')}} + switch (a) { case name1::F1: break; case name1::F3: break; @@ -233,4 +257,23 @@ void test () { case FooB: break; case FooC: break; } + + switch (td) { + case TD1: break; + case FooB: break; // expected-warning {{comparison of two values with different enumeration types in switch statement ('TD' and 'Foo')}} + case BarF: break; // expected-warning {{comparison of two values with different enumeration types in switch statement ('TD' and 'Bar')}} + // expected-warning@-1 {{case value not in enumerated type 'TD'}} + case AnonAA: break; // expected-warning {{case value not in enumerated type 'TD'}} + } + + switch (td) { + case Anon1: break; + case TD2: break; + } + + switch (a) { + case TD1: break; // expected-warning {{comparison of two values with different enumeration types in switch statement ('name1::Foo' and 'TD')}} + case TD2: break; // expected-warning {{comparison of two values with different enumeration types in switch statement ('name1::Foo' and 'TD')}} + case name1::F3: break; + } } -- 2.40.0