diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 3 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/test/Sema/warn-conditional-emum-types-mismatch.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 4c7ea3d4ea2..16de6a2d07e 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -563,8 +563,9 @@ def CoveredSwitchDefault : DiagGroup<"covered-switch-default">; def SwitchBool : DiagGroup<"switch-bool">; def SwitchEnum : DiagGroup<"switch-enum">; def Switch : DiagGroup<"switch">; +def EnumCompareConditional : DiagGroup<"enum-compare-conditional">; def EnumCompareSwitch : DiagGroup<"enum-compare-switch">; -def EnumCompare : DiagGroup<"enum-compare", [EnumCompareSwitch]>; +def EnumCompare : DiagGroup<"enum-compare", [EnumCompareConditional, EnumCompareSwitch]>; def ImplicitFallthroughPerFunction : DiagGroup<"implicit-fallthrough-per-function">; def ImplicitFallthrough : DiagGroup<"implicit-fallthrough", diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index d1b9aea0294..dffaf5592f7 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -6172,7 +6172,7 @@ def warn_comparison_of_mixed_enum_types : Warning< def warn_conditional_mixed_enum_types : Warning< "enumeration type mismatch in conditional expression" "%diff{ ($ and $)|}0,1">, - InGroup<EnumCompare>; + InGroup<EnumCompareConditional>; def warn_comparison_of_mixed_enum_types_switch : Warning< "comparison of two values with different enumeration types in switch statement" "%diff{ ($ and $)|}0,1">, diff --git a/clang/test/Sema/warn-conditional-emum-types-mismatch.c b/clang/test/Sema/warn-conditional-emum-types-mismatch.c index 4325bb0c41c..ec7f1b37ffe 100644 --- a/clang/test/Sema/warn-conditional-emum-types-mismatch.c +++ b/clang/test/Sema/warn-conditional-emum-types-mismatch.c @@ -1,5 +1,7 @@ +// RUN: %clang_cc1 -x c -fsyntax-only -verify -Wenum-compare-conditional %s // RUN: %clang_cc1 -x c -fsyntax-only -verify -Wenum-compare %s // RUN: %clang_cc1 -x c -fsyntax-only -verify %s +// RUN: %clang_cc1 -x c++ -fsyntax-only -verify -Wenum-compare-conditional %s // RUN: %clang_cc1 -x c++ -fsyntax-only -verify -Wenum-compare %s // RUN: %clang_cc1 -x c++ -fsyntax-only -verify %s |
