diff options
| author | Marek Polacek <polacek@redhat.com> | 2016-10-07 12:44:54 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2016-10-07 12:44:54 +0000 |
| commit | a9172bf307dd49fa001387f4b514ea49d38f2092 (patch) | |
| tree | 9a20274567104fda6593fcc35ed4b64bb5d20406 /gcc | |
| parent | 8a14afd0657b21e1de31fd1b2146056b09dbab5b (diff) | |
| download | gcc-a9172bf307dd49fa001387f4b514ea49d38f2092.zip gcc-a9172bf307dd49fa001387f4b514ea49d38f2092.tar.gz gcc-a9172bf307dd49fa001387f4b514ea49d38f2092.tar.bz2 | |
gimplify.c (should_warn_for_implicit_fallthrough): Check for FALLTHROUGH_LABEL_P here...
* gimplify.c (should_warn_for_implicit_fallthrough): Check for
FALLTHROUGH_LABEL_P here...
(warn_implicit_fallthrough_r): ...not here.
* c-c++-common/Wimplicit-fallthrough-22.c: New test.
From-SVN: r240864
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gimplify.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/Wimplicit-fallthrough-22.c | 23 |
4 files changed, 37 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e4f5198..efc6ae5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-10-07 Marek Polacek <polacek@redhat.com> + + * gimplify.c (should_warn_for_implicit_fallthrough): Check for + FALLTHROUGH_LABEL_P here... + (warn_implicit_fallthrough_r): ...not here. + 2016-10-07 Bernd Schmidt <bschmidt@redhat.com> PR tree-optimization/77880 diff --git a/gcc/gimplify.c b/gcc/gimplify.c index a60d947..2266333 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -1819,6 +1819,10 @@ should_warn_for_implicit_fallthrough (gimple_stmt_iterator *gsi_p, tree label) { gimple_stmt_iterator gsi = *gsi_p; + /* Don't warn if the label is marked with a "falls through" comment. */ + if (FALLTHROUGH_LABEL_P (label)) + return false; + /* Don't warn for a non-case label followed by a statement: case 0: foo (); @@ -1905,7 +1909,6 @@ warn_implicit_fallthrough_r (gimple_stmt_iterator *gsi_p, bool *handled_ops_p, if (gimple_code (next) == GIMPLE_LABEL && gimple_has_location (next) && (label = gimple_label_label (as_a <glabel *> (next))) - && !FALLTHROUGH_LABEL_P (label) && prev != NULL) { struct label_entry *l; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f8769a7..89e9df8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2016-10-07 Marek Polacek <polacek@redhat.com> + + * c-c++-common/Wimplicit-fallthrough-22.c: New test. + 2016-10-07 Bernd Schmidt <bschmidt@redhat.com> PR c++/69733 diff --git a/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-22.c b/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-22.c new file mode 100644 index 0000000..f7d86fa --- /dev/null +++ b/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-22.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-Wimplicit-fallthrough" } */ + +void bar (int); + +void +foo (int i) +{ + switch (i) + { + case 1: + bar (1); + /* FALLTHROUGH */ + case 2: + bar (2); /* { dg-warning "statement may fall through" } */ + case 3: + bar (3); /* { dg-warning "statement may fall through" } */ + case 4: + bar (4); + default: + break; + } +} |