From 12d3031b2c31ad7c9ec956eba52f8451f7b284aa Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 9 Oct 2014 12:45:07 +0000 Subject: [PATCH] re PR tree-optimization/63380 (Wrong constant folding) 2014-10-09 Richard Biener 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 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.dg/torture/pr63380-1.c | 15 +++++++++++++++ gcc/testsuite/gcc.dg/torture/pr63380-2.c | 10 ++++++++++ gcc/tree-ssa-tail-merge.c | 6 +++--- 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr63380-1.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr63380-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5300c011904..23d7bbe4f4c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-09 Richard Biener + + PR tree-optimization/63380 + * tree-ssa-tail-merge.c (stmt_local_def): Exclude stmts that + may trap. + 2014-10-09 Joern Rennecke * config/avr/avr.opt (mmcu=): Change to have a string value. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ea731bf0abd..0cee7d6cf62 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-10-09 Richard Biener + + PR tree-optimization/63380 + * gcc.dg/torture/pr63380-1.c: New testcase. + * gcc.dg/torture/pr63380-2.c: Likewise. + 2014-10-09 Marek Polacek 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 00000000000..29deface81d --- /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 00000000000..f4cbc43eb7d --- /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 5615c791421..37181bd6c74 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); -- 2.30.2