From: David Blaikie <dblaikie@gmail.com>
Date: Mon, 23 Jan 2012 04:58:54 +0000 (+0000)
Subject: Rename -Wswitch-enum-redundant-default to -Wswitch-redundant-default.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=413c2c9d9c85ceb588e9cb965853f178a3a52bc9;p=clang

Rename -Wswitch-enum-redundant-default to -Wswitch-redundant-default.

This is for consistency, since the flag is actually under -Wswitch now, rather
than -Wswitch-enum (since it's really valuable for the former and rather
orthogonal to the latter)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148680 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td
index 7211db2984..218120f515 100644
--- a/include/clang/Basic/DiagnosticGroups.td
+++ b/include/clang/Basic/DiagnosticGroups.td
@@ -179,8 +179,8 @@ def : DiagGroup<"strict-prototypes">;
 def StrictSelector : DiagGroup<"strict-selector-match">;
 def MethodDuplicate : DiagGroup<"duplicate-method-match">;
 def SwitchEnum     : DiagGroup<"switch-enum">;
-def SwitchEnumRedundantDefault : DiagGroup<"switch-enum-redundant-default">;
-def Switch         : DiagGroup<"switch", [SwitchEnumRedundantDefault]>;
+def SwitchRedundantDefault : DiagGroup<"switch-redundant-default">;
+def Switch         : DiagGroup<"switch", [SwitchRedundantDefault]>;
 def Trigraphs      : DiagGroup<"trigraphs">;
 
 def : DiagGroup<"type-limits">;
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index d02910a40e..96f85f6f6e 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -4973,7 +4973,7 @@ def warn_missing_cases : Warning<
 
 def warn_unreachable_default : Warning<
   "default is unreachable as all enumeration values are accounted for">,
-  InGroup<SwitchEnumRedundantDefault>;
+  InGroup<SwitchRedundantDefault>;
 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/test/Sema/switch-enum.c b/test/Sema/switch-enum.c
index 5cf98f78ac..98db150f33 100644
--- a/test/Sema/switch-enum.c
+++ b/test/Sema/switch-enum.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -Wswitch-enum -Wno-switch-enum-redundant-default %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wswitch-enum -Wno-switch-redundant-default %s
 
 int test1() {
   enum { A, B } a;
diff --git a/test/Sema/warn-unreachable.c b/test/Sema/warn-unreachable.c
index 46a680f0ef..49275a5a9b 100644
--- a/test/Sema/warn-unreachable.c
+++ b/test/Sema/warn-unreachable.c
@@ -1,4 +1,4 @@
-// RUN: %clang %s -fsyntax-only -Xclang -verify -fblocks -Wunreachable-code -Wno-unused-value -Wno-switch-enum-redundant-default
+// RUN: %clang %s -fsyntax-only -Xclang -verify -fblocks -Wunreachable-code -Wno-unused-value -Wno-switch-redundant-default
 
 int halt() __attribute__((noreturn));
 int live();
diff --git a/test/SemaCXX/gnu-case-ranges.cpp b/test/SemaCXX/gnu-case-ranges.cpp
index 94100d2e83..cda8b734cf 100644
--- a/test/SemaCXX/gnu-case-ranges.cpp
+++ b/test/SemaCXX/gnu-case-ranges.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -Wno-switch-enum-redundant-default %s
+// RUN: %clang_cc1 -verify -Wno-switch-redundant-default %s
 
 enum E {
     one,
diff --git a/test/SemaCXX/return-noreturn.cpp b/test/SemaCXX/return-noreturn.cpp
index 4b1f82dc6a..ce81933738 100644
--- a/test/SemaCXX/return-noreturn.cpp
+++ b/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-enum-redundant-default
-// RUN: %clang_cc1 %s -fsyntax-only -std=c++11 -verify -Wreturn-type -Wmissing-noreturn -Wno-unreachable-code -Wno-switch-enum-redundant-default
+// 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
 
 // A destructor may be marked noreturn and should still influence the CFG.
 void pr6884_abort() __attribute__((noreturn));