From 201ae393e61498aec3afc6a3d426aa2f6577aae0 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 22 Aug 2005 16:21:18 +0000 Subject: [PATCH] re PR c/18715 (warning: "enumeration value not handled in switch" for '...' ranges) 2005-08-22 Andrew Pinski PR c/18715 * c-common.c (c_do_switch_warnings): Look for a node where the enum's value is inbetween the range if we did not find an exact match. 2005-08-22 Andrew Pinski PR c/18175 * gcc.dg/switch-warn-3.c: New test. From-SVN: r103343 --- gcc/ChangeLog | 6 ++++++ gcc/c-common.c | 27 ++++++++++++++++++++++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/switch-warn-3.c | 14 ++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/switch-warn-3.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d98726f05b70..8a5e2f00c21e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-08-22 Andrew Pinski + + PR c/18715 + * c-common.c (c_do_switch_warnings): Look for a node where the enum's + value is inbetween the range if we did not find an exact match. + 2005-08-22 Aldy Hernandez * doc/invoke.texi (Option Summary): Add ms1 options. diff --git a/gcc/c-common.c b/gcc/c-common.c index 0b208fdfbc5e..678327779bf2 100644 --- a/gcc/c-common.c +++ b/gcc/c-common.c @@ -3804,7 +3804,32 @@ c_do_switch_warnings (splay_tree cases, location_t switch_location, { splay_tree_node node = splay_tree_lookup (cases, (splay_tree_key) TREE_VALUE (chain)); - + if (!node) + { + tree low_value = TREE_VALUE (chain); + splay_tree_node low_bound; + splay_tree_node high_bound; + /* Even though there wasn't an exact match, there might be a + case range which includes the enumator's value. */ + low_bound = splay_tree_predecessor (cases, + (splay_tree_key) low_value); + high_bound = splay_tree_successor (cases, + (splay_tree_key) low_value); + + /* It is smaller than the LOW_VALUE, so there is no need to check + unless the LOW_BOUND is in fact itself a case range. */ + if (low_bound + && CASE_HIGH ((tree) low_bound->value) + && tree_int_cst_compare (CASE_HIGH ((tree) low_bound->value), + low_value) >= 0) + node = low_bound; + /* The low end of that range is bigger than the current value. */ + else if (high_bound + && (tree_int_cst_compare ((tree) high_bound->key, + low_value) + <= 0)) + node = high_bound; + } if (node) { /* Mark the CASE_LOW part of the case entry as seen, so diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b85a569c58fb..045be39ba26f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-08-22 Andrew Pinski + + PR c/18175 + * gcc.dg/switch-warn-3.c: New test. + 2005-08-22 Volker Reichelt PR c++/22233 diff --git a/gcc/testsuite/gcc.dg/switch-warn-3.c b/gcc/testsuite/gcc.dg/switch-warn-3.c new file mode 100644 index 000000000000..e13b4f58a7f0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/switch-warn-3.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-Wswitch-enum" } */ + +enum a { a0, a1, a2, a3 }; + +int error(enum a aa) +{ + switch ( aa ) + { + case a0 ... a3: + return 1; + } + return 0; +}