diff options
| author | Richard Biener <rguenther@suse.de> | 2014-10-09 12:45:07 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2014-10-09 12:45:07 +0000 |
| commit | 12d3031b2c31ad7c9ec956eba52f8451f7b284aa (patch) | |
| tree | b22fea752b05a8fda97103bfae178bf7c7769d48 | |
| parent | 3b7ea188c0457b2e70bdefc8cb53a790e7e9b296 (diff) | |
| download | gcc-12d3031b2c31ad7c9ec956eba52f8451f7b284aa.zip gcc-12d3031b2c31ad7c9ec956eba52f8451f7b284aa.tar.gz gcc-12d3031b2c31ad7c9ec956eba52f8451f7b284aa.tar.bz2 | |
re PR tree-optimization/63380 (Wrong constant folding)
2014-10-09 Richard Biener <rguenther@suse.de>
PR tree-optimization/63380
* tree-ssa-tail-merge.c (stmt_local_def): Exclude stmts that
may trap.
* gcc.dg/torture/pr63380-1.c: New testcase.
* gcc.dg/torture/pr63380-2.c: Likewise.
From-SVN: r216038
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr63380-1.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr63380-2.c | 10 | ||||
| -rw-r--r-- | gcc/tree-ssa-tail-merge.c | 6 |
5 files changed, 40 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5300c01..23d7bbe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-09 Richard Biener <rguenther@suse.de> + + PR tree-optimization/63380 + * tree-ssa-tail-merge.c (stmt_local_def): Exclude stmts that + may trap. + 2014-10-09 Joern Rennecke <joern.rennecke@embecosm.com> * config/avr/avr.opt (mmcu=): Change to have a string value. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ea731bf..0cee7d6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-10-09 Richard Biener <rguenther@suse.de> + + PR tree-optimization/63380 + * gcc.dg/torture/pr63380-1.c: New testcase. + * gcc.dg/torture/pr63380-2.c: Likewise. + 2014-10-09 Marek Polacek <polacek@redhat.com> PR c/63480 diff --git a/gcc/testsuite/gcc.dg/torture/pr63380-1.c b/gcc/testsuite/gcc.dg/torture/pr63380-1.c new file mode 100644 index 0000000..29defac --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr63380-1.c @@ -0,0 +1,15 @@ +/* { dg-do run } */ + +int a = 0, b = 1, c = 0, d = 1, e, f, g, h; +int +main () +{ + e = 1 >> d; + f = ((31 / (1 > e)) || c) / 2; + g = b || a; + h = 31 / g; + if (!h) + __builtin_abort(); + return 0; +} + diff --git a/gcc/testsuite/gcc.dg/torture/pr63380-2.c b/gcc/testsuite/gcc.dg/torture/pr63380-2.c new file mode 100644 index 0000000..f4cbc43 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr63380-2.c @@ -0,0 +1,10 @@ +/* { dg-do run } */ + +int a = 0, b = 0, c = 0, d, e; +int +main (void) +{ + d = ((20 % (1 != b)) && c) + 2147483647; + e = 20 % (a >= 0); + return 0; +} diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c index 5615c79..37181bd 100644 --- a/gcc/tree-ssa-tail-merge.c +++ b/gcc/tree-ssa-tail-merge.c @@ -313,9 +313,9 @@ stmt_local_def (gimple stmt) tree val; def_operand_p def_p; - if (gimple_has_side_effects (stmt) - || stmt_could_throw_p (stmt) - || gimple_vdef (stmt) != NULL_TREE) + if (gimple_vdef (stmt) != NULL_TREE + || gimple_has_side_effects (stmt) + || gimple_could_trap_p_1 (stmt, false, false)) return false; def_p = SINGLE_SSA_DEF_OPERAND (stmt, SSA_OP_DEF); |