Author: xbolva00 Date: Tue Oct 1 08:44:38 2019 New Revision: 373345 URL: http://llvm.org/viewvc/llvm-project?rev=373345&view=rev Log: [Diagnostics] Move warning into the subgroup (-Wenum-compare-conditional)
Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td cfe/trunk/test/Sema/warn-conditional-emum-types-mismatch.c Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=373345&r1=373344&r2=373345&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Tue Oct 1 08:44:38 2019 @@ -563,8 +563,9 @@ def CoveredSwitchDefault : DiagGroup<"co 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", Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=373345&r1=373344&r2=373345&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Tue Oct 1 08:44:38 2019 @@ -6172,7 +6172,7 @@ def warn_comparison_of_mixed_enum_types 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">, Modified: cfe/trunk/test/Sema/warn-conditional-emum-types-mismatch.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/warn-conditional-emum-types-mismatch.c?rev=373345&r1=373344&r2=373345&view=diff ============================================================================== --- cfe/trunk/test/Sema/warn-conditional-emum-types-mismatch.c (original) +++ cfe/trunk/test/Sema/warn-conditional-emum-types-mismatch.c Tue Oct 1 08:44:38 2019 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits