diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 4 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 4 | ||||
| -rw-r--r-- | clang/test/Sema/switch.c | 2 | ||||
| -rw-r--r-- | clang/test/Sema/warn-unreachable.c | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/gnu-case-ranges.cpp | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/return-noreturn.cpp | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 82167951ce0..b609b40fe3d 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -184,8 +184,8 @@ def : DiagGroup<"strict-prototypes">; def StrictSelector : DiagGroup<"strict-selector-match">; def MethodDuplicate : DiagGroup<"duplicate-method-match">; def SwitchEnum : DiagGroup<"switch-enum">; -def SwitchRedundantDefault : DiagGroup<"switch-redundant-default">; -def Switch : DiagGroup<"switch", [SwitchRedundantDefault]>; +def CoveredSwitchDefault : DiagGroup<"covered-switch-default">; +def Switch : DiagGroup<"switch", [CoveredSwitchDefault]>; def Trigraphs : DiagGroup<"trigraphs">; def : DiagGroup<"type-limits">; diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 853f7666b32..6c2c4ef5589 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -4987,8 +4987,8 @@ def warn_missing_cases : Warning< InGroup<Switch>; def warn_unreachable_default : Warning< - "default is unreachable as all enumeration values are accounted for">, - InGroup<SwitchRedundantDefault>; + "default label in switch which covers all enumeration values">, + InGroup<CoveredSwitchDefault>; def warn_not_in_enum : Warning<"case value not in enumerated type %0">, InGroup<Switch>; def err_typecheck_statement_requires_scalar : Error< diff --git a/clang/test/Sema/switch.c b/clang/test/Sema/switch.c index 012c5ecee7d..2dc965f4a0b 100644 --- a/clang/test/Sema/switch.c +++ b/clang/test/Sema/switch.c @@ -295,6 +295,6 @@ int test18() { case A: return 0; case B: return 1; case 7: return 1; // expected-warning {{case value not in enumerated type}} - default: return 2; // expected-warning {{default is unreachable as all enumeration values are accounted for}} + default: return 2; // expected-warning {{default label in switch which covers all enumeration values}} } } diff --git a/clang/test/Sema/warn-unreachable.c b/clang/test/Sema/warn-unreachable.c index 49275a5a9b9..636513f62c7 100644 --- a/clang/test/Sema/warn-unreachable.c +++ b/clang/test/Sema/warn-unreachable.c @@ -1,4 +1,4 @@ -// RUN: %clang %s -fsyntax-only -Xclang -verify -fblocks -Wunreachable-code -Wno-unused-value -Wno-switch-redundant-default +// RUN: %clang %s -fsyntax-only -Xclang -verify -fblocks -Wunreachable-code -Wno-unused-value -Wno-covered-switch-default int halt() __attribute__((noreturn)); int live(); diff --git a/clang/test/SemaCXX/gnu-case-ranges.cpp b/clang/test/SemaCXX/gnu-case-ranges.cpp index cda8b734cfe..b082e3a6c1c 100644 --- a/clang/test/SemaCXX/gnu-case-ranges.cpp +++ b/clang/test/SemaCXX/gnu-case-ranges.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -verify -Wno-switch-redundant-default %s +// RUN: %clang_cc1 -verify -Wno-covered-switch-default %s enum E { one, diff --git a/clang/test/SemaCXX/return-noreturn.cpp b/clang/test/SemaCXX/return-noreturn.cpp index ce819337384..617de008958 100644 --- a/clang/test/SemaCXX/return-noreturn.cpp +++ b/clang/test/SemaCXX/return-noreturn.cpp @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 %s -fsyntax-only -verify -Wreturn-type -Wmissing-noreturn -Wno-unreachable-code -Wno-switch-redundant-default -// RUN: %clang_cc1 %s -fsyntax-only -std=c++11 -verify -Wreturn-type -Wmissing-noreturn -Wno-unreachable-code -Wno-switch-redundant-default +// RUN: %clang_cc1 %s -fsyntax-only -verify -Wreturn-type -Wmissing-noreturn -Wno-unreachable-code -Wno-covered-switch-default +// RUN: %clang_cc1 %s -fsyntax-only -std=c++11 -verify -Wreturn-type -Wmissing-noreturn -Wno-unreachable-code -Wno-covered-switch-default // A destructor may be marked noreturn and should still influence the CFG. void pr6884_abort() __attribute__((noreturn)); |
