re PR c/18715 (warning: "enumeration value not handled in switch" for '...' ranges)

2005-08-22  Andrew Pinski  <pinskia@physics.uc.edu>

        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  <pinskia@physics.uc.edu>

        PR c/18175
        * gcc.dg/switch-warn-3.c: New test.

From-SVN: r103343

gcc/ChangeLog

+2005-08-22  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	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  <aldyh@redhat.com>
 
 	* doc/invoke.texi (Option Summary): Add ms1 options.

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

gcc/testsuite/ChangeLog

+2005-08-22  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR c/18175
+	* gcc.dg/switch-warn-3.c: New test.
+
 2005-08-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c++/22233

gcc/testsuite/gcc.dg/switch-warn-3.c

+/* { 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;
+}