summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2005-10-17 13:54:34 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2005-10-17 13:54:34 +0000
commitdae1bf4d22414d05d627b3ef619d888d773715b6 (patch)
tree8b6b365e7f47a804d1ed870d77c86ff5467fe674
parent61efc800192945b33cdb2bba51efbdfd133d84d4 (diff)
downloadgcc-dae1bf4d22414d05d627b3ef619d888d773715b6.tar.gz
re PR c++/22551 ([ICE] in tree_low_cst, at tree.c:3843)
.: PR c++/22551 * c-common.c (c_add_case_label): Revert my 2005-10-14 clearing of overflow flags. testsuite: PR c++/22551 * g++.dg/other/switch2.C: Remove expected warnings. From-SVN: r105501
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-common.c5
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/other/switch2.C15
4 files changed, 17 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9825d7463eb..b34969c714b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-17 Nathan Sidwell <nathan@codesourcery.com>
+
+ PR c++/22551
+ * c-common.c (c_add_case_label): Revert my 2005-10-14 clearing of
+ overflow flags.
+
2005-10-17 Kaz Kojima <kkojima@gcc.gnu.org>
* config/sh/sh.h (OPTIMIZATION_OPTIONS): Set flag_schedule_insns
diff --git a/gcc/c-common.c b/gcc/c-common.c
index c5ba85e3d0a..86bb1c856cc 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -3590,10 +3590,6 @@ c_add_case_label (splay_tree cases, tree cond, tree orig_type,
low_value = convert_and_check (type, low_value);
if (low_value == error_mark_node)
goto error_out;
- /* Do not propagate any overflow information past this point.
- It is safe to just clear the flags, as any constants with
- them set will not be shared. */
- TREE_CONSTANT_OVERFLOW (low_value) = TREE_OVERFLOW (low_value) = 0;
}
if (high_value)
{
@@ -3601,7 +3597,6 @@ c_add_case_label (splay_tree cases, tree cond, tree orig_type,
high_value = convert_and_check (type, high_value);
if (high_value == error_mark_node)
goto error_out;
- TREE_CONSTANT_OVERFLOW (high_value) = TREE_OVERFLOW (high_value) = 0;
}
if (low_value && high_value)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6eeadc5b343..e17dc16bf02 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2005-10-17 Nathan Sidwell <nathan@codesourcery.com>
+ PR c++/22551
+ * g++.dg/other/switch2.C: Remove expected warnings.
+
PR c++/21353
* g++.dg/template/defarg6.C: New.
diff --git a/gcc/testsuite/g++.dg/other/switch2.C b/gcc/testsuite/g++.dg/other/switch2.C
index a2352c0acbc..6994e2a39bb 100644
--- a/gcc/testsuite/g++.dg/other/switch2.C
+++ b/gcc/testsuite/g++.dg/other/switch2.C
@@ -4,7 +4,7 @@
// PR 22551:ICE
// Origin: Johnny Casey <emailwastefilter-bugzillagccorg@yahoo.com>
-const int B = 0x80000000;
+const int B = ~(~0u >> 1);
#define b(x) (B + x)
@@ -13,10 +13,11 @@ int Foo (int error)
{
switch (error)
{
- case b (1): return 0; // { dg-error "overflow" "" }
- case b (2): return 0; // { dg-error "overflow" "" }
- case b (3): return 0; // { dg-error "overflow" "" }
- case b (4): return 0; // { dg-error "overflow" "" }
- case b (5): return 0; // { dg-error "overflow" "" }
- }
+ case b (1): return 0;
+ case b (2): return 0;
+ case b (3): return 0;
+ case b (4): return 0;
+ case b (5): return 0;
+ }
+ return 0;
}