diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dd9feb59d05275eb497727bda7c79cb451cbf86b..0c5c29f8998e6632d180bbf348a5a3ecbfebcd42 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-03  Richard Guenther  <rguenther@suse.de>
+
+	PR c/25183
+	* stmt.c (add_case_node): Make sure to clear overflow flags
+	from ranges.
+
 2006-01-03  Jakub Jelinek  <jakub@redhat.com>
 
 	Merge from gomp-branch.
diff --git a/gcc/stmt.c b/gcc/stmt.c
index ad75392010b34235e9a1b85a094c825ed0a26f31..02ec490d9280758e1672f56101fc5c18f95e6b44 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -2104,10 +2104,12 @@ add_case_node (struct case_node *head, tree type, tree low, tree high,
     }
 
 
-  /* Add this label to the chain.  */
+  /* Add this label to the chain.  Make sure to drop overflow flags.  */
   r = ggc_alloc (sizeof (struct case_node));
-  r->low = low;
-  r->high = high;
+  r->low = build_int_cst_wide (TREE_TYPE (low), TREE_INT_CST_LOW (low),
+			       TREE_INT_CST_HIGH (low));
+  r->high = build_int_cst_wide (TREE_TYPE (high), TREE_INT_CST_LOW (high),
+				TREE_INT_CST_HIGH (high));
   r->code_label = label;
   r->parent = r->left = NULL;
   r->right = head;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1acf301b8de62baf93b1e281d6312830694fa056..4199859bed9f0bae19722db40b1b3d6cccf090eb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-03  Richard Guenther  <rguenther@suse.de>
+
+	PR c/25183
+	* gcc.dg/torture/pr25183.c: New testcase.
+
 2006-01-03  Jakub Jelinek  <jakub@redhat.com>
 
 	Merge from gomp-branch.
diff --git a/gcc/testsuite/gcc.dg/torture/pr25183.c b/gcc/testsuite/gcc.dg/torture/pr25183.c
new file mode 100644
index 0000000000000000000000000000000000000000..a6c624cf4722d1344adc8c906fee07793af8ac44
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr25183.c
@@ -0,0 +1,22 @@
+/* { dg-do compile } */
+/* { dg-options "-pedantic" } */
+
+enum err {
+  err_IO = 0x8a450000, /* { dg-warning "int" } */
+  err_NM,
+  err_EOF,
+  err_SE,
+  err_PT
+};
+static enum err E_;
+int error()
+{
+  switch (E_) {
+    case err_IO : break;  /* { dg-warning "overflow" } */
+    case err_NM : break;  /* { dg-warning "overflow" } */
+    case err_EOF : break; /* { dg-warning "overflow" } */
+    case err_SE : break;  /* { dg-warning "overflow" } */
+    case err_PT : break;  /* { dg-warning "overflow" } */
+    default : return 0;
+  }
+}