xbolva00 created this revision.
xbolva00 added reviewers: hfinkel, lattner, rsmith.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
For MSVC compatibility, based on request in
https://bugs.llvm.org/show_bug.cgi?id=4546.
Repository:
rC Clang
https://reviews.llvm.org/D63192
Files:
include/clang/Basic/DiagnosticGroups.td
include/clang/Basic/DiagnosticSemaKinds.td
lib/Sema/SemaStmt.cpp
test/Sema/switch_default.c
test/SemaCXX/switch_default.cpp
Index: test/SemaCXX/switch_default.cpp
===================================================================
--- test/SemaCXX/switch_default.cpp
+++ test/SemaCXX/switch_default.cpp
@@ -0,0 +1,40 @@
+// RUN: %clang_cc1 -x c++ -fsyntax-only -verify -Wswitch-default %s
+// RUN: %clang_cc1 -x c++ -fsyntax-only -verify -Wempty-body %s
+// RUN: %clang_cc1 -x c++ -fsyntax-only -verify -Wall %s
+
+void test(int x) {
+ switch (x) {
+ default: // expected-warning {{switch contains only default label}}
+ break;
+ }
+
+ switch (x) {
+ default: // expected-warning {{switch contains only default label}}
+ x++;
+ }
+
+ switch (x) {
+ default:; // expected-warning {{switch contains only default label}}
+ }
+
+ switch (x)
+ default: // expected-warning {{switch contains only default label}}
+ break;
+
+ switch (x) {
+ default:
+ return;
+ case 1:
+ break;
+ }
+
+ switch (x) {
+ case 1:
+ break;
+ default:
+ return;
+ }
+
+ switch (x) { // expected-warning {{switch statement has empty body}}
+ }
+}
Index: test/Sema/switch_default.c
===================================================================
--- test/Sema/switch_default.c
+++ test/Sema/switch_default.c
@@ -0,0 +1,40 @@
+// RUN: %clang_cc1 -x c -fsyntax-only -verify -Wswitch-default %s
+// RUN: %clang_cc1 -x c -fsyntax-only -verify -Wempty-body %s
+// RUN: %clang_cc1 -x c -fsyntax-only -verify -Wall %s
+
+void test(int x) {
+ switch (x) {
+ default: // expected-warning {{switch contains only default label}}
+ break;
+ }
+
+ switch (x) {
+ default: // expected-warning {{switch contains only default label}}
+ x++;
+ }
+
+ switch (x) {
+ default:; // expected-warning {{switch contains only default label}}
+ }
+
+ switch (x)
+ default: // expected-warning {{switch contains only default label}}
+ break;
+
+ switch (x) {
+ default:
+ return;
+ case 1:
+ break;
+ }
+
+ switch (x) {
+ case 1:
+ break;
+ default:
+ return;
+ }
+
+ switch (x) { // expected-warning {{switch statement has empty body}}
+ }
+}
Index: lib/Sema/SemaStmt.cpp
===================================================================
--- lib/Sema/SemaStmt.cpp
+++ lib/Sema/SemaStmt.cpp
@@ -865,8 +865,13 @@
bool CaseListIsErroneous = false;
- for (SwitchCase *SC = SS->getSwitchCaseList(); SC && !HasDependentValue;
- SC = SC->getNextSwitchCase()) {
+ SwitchCase *SC = SS->getSwitchCaseList();
+ if (!SC)
+ Diag(SS->getBeginLoc(), diag::warn_empty_switch_body);
+ else if (isa<DefaultStmt>(SC) && !SC->getNextSwitchCase())
+ Diag(SC->getBeginLoc(), diag::warn_default_only_in_switch);
+
+ for (; SC && !HasDependentValue; SC = SC->getNextSwitchCase()) {
if (DefaultStmt *DS = dyn_cast<DefaultStmt>(SC)) {
if (TheDefaultStmt) {
Index: include/clang/Basic/DiagnosticSemaKinds.td
===================================================================
--- include/clang/Basic/DiagnosticSemaKinds.td
+++ include/clang/Basic/DiagnosticSemaKinds.td
@@ -8185,6 +8185,8 @@
def warn_break_binds_to_switch : Warning<
"'break' is bound to loop, GCC binds it to switch">,
InGroup<GccCompat>;
+def warn_default_only_in_switch : Warning<
+ "switch contains only default label">, InGroup<SwitchDefault>, DefaultIgnore;
def err_default_not_in_switch : Error<
"'default' statement not in switch statement">;
def err_case_not_in_switch : Error<"'case' statement not in switch statement">;
Index: include/clang/Basic/DiagnosticGroups.td
===================================================================
--- include/clang/Basic/DiagnosticGroups.td
+++ include/clang/Basic/DiagnosticGroups.td
@@ -458,7 +458,6 @@
def : DiagGroup<"sign-promo">;
def SignCompare : DiagGroup<"sign-compare">;
def : DiagGroup<"stack-protector">;
-def : DiagGroup<"switch-default">;
def : DiagGroup<"synth">;
def SizeofArrayArgument : DiagGroup<"sizeof-array-argument">;
def SizeofArrayDecay : DiagGroup<"sizeof-array-decay">;
@@ -537,6 +536,7 @@
def ObjCCStringFormat : DiagGroup<"cstring-format-directive">;
def CoveredSwitchDefault : DiagGroup<"covered-switch-default">;
def SwitchBool : DiagGroup<"switch-bool">;
+def SwitchDefault : DiagGroup<"switch-default">;
def SwitchEnum : DiagGroup<"switch-enum">;
def Switch : DiagGroup<"switch">;
def EnumCompareSwitch : DiagGroup<"enum-compare-switch">;
@@ -842,7 +842,7 @@
// Note that putting warnings in -Wall will not disable them by default. If a
// warning should be active _only_ when -Wall is passed in, mark it as
// DefaultIgnore in addition to putting it here.
-def All : DiagGroup<"all", [Most, Parentheses, Switch, SwitchBool]>;
+def All : DiagGroup<"all", [Most, Parentheses, Switch, SwitchBool, SwitchDefault]>;
// Warnings that should be in clang-cl /w4.
def : DiagGroup<"CL4", [All, Extra]>;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
