diff options
| author | Richard Sandiford <rsandifo@nildram.co.uk> | 2007-10-09 11:05:33 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2007-10-09 11:05:33 +0000 |
| commit | 05c42b11e64489819f65e0daec4679f311ec3632 (patch) | |
| tree | 94d4249b124b7d6332c42eef3d7a4bddeec5583c /gcc | |
| parent | 94172876940bd493e6c193e46dfacaa77d1f8606 (diff) | |
| download | gcc-05c42b11e64489819f65e0daec4679f311ec3632.zip gcc-05c42b11e64489819f65e0daec4679f311ec3632.tar.gz gcc-05c42b11e64489819f65e0daec4679f311ec3632.tar.bz2 | |
re PR tree-optimization/33615 (Hoisting of potentially-throwing values for -fnon-call-exceptions)
gcc/
PR tree-optimization/33615
* tree-ssa-pre.c (compute_avail): Don't call make_values_for_stmt
if the statement might throw. Fix formatting.
gcc/testsuite/
PR tree-optimization/33615
* g++.dg/tree-ssa/pr33615-2.C: New test.
From-SVN: r129164
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tree-ssa/pr33615-2.C | 20 | ||||
| -rw-r--r-- | gcc/tree-ssa-pre.c | 9 |
4 files changed, 36 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1d66ea3..43c2c9d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,12 @@ 2007-10-09 Richard Sandiford <rsandifo@nildram.co.uk> PR tree-optimization/33615 + * tree-ssa-pre.c (compute_avail): Don't call make_values_for_stmt + if the statement might throw. Fix formatting. + +2007-10-09 Richard Sandiford <rsandifo@nildram.co.uk> + + PR tree-optimization/33615 * tree-ssa-loop-im.c (movement_possibility): Return MOVE_IMPOSSIBLE if the rhs might throw. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f6665d5..61dd6de 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2007-10-09 Richard Sandiford <rsandifo@nildram.co.uk> PR tree-optimization/33615 + * g++.dg/tree-ssa/pr33615-2.C: New test. + +2007-10-09 Richard Sandiford <rsandifo@nildram.co.uk> + + PR tree-optimization/33615 * g++.dg/tree-ssa/pr33615.C: New test. 2007-10-08 Alexandre Oliva <aoliva@redhat.com> diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr33615-2.C b/gcc/testsuite/g++.dg/tree-ssa/pr33615-2.C new file mode 100644 index 0000000..542731a --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr33615-2.C @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fnon-call-exceptions -fdump-tree-pre-details -w" } */ + +extern volatile int y; + +double +foo (double a, int x) +{ + while (x--) + { + y++; + a += 1.0 / 0.0; + } + return a; +} + +// The expression 1.0 / 0.0 should not be treated as a loop invariant +// if it may throw an exception. +// { dg-final { scan-tree-dump-times "Replaced 1\\\.0e\\\+0 / 0\\\.0" 0 "pre" } } +// { dg-final { cleanup-tree-dump "pre" } } diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 33c44ee..6203467 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -3555,10 +3555,11 @@ compute_avail (void) } else if (TREE_CODE (stmt) == GIMPLE_MODIFY_STMT - && !ann->has_volatile_ops - && TREE_CODE (GIMPLE_STMT_OPERAND (stmt, 0)) == SSA_NAME - && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI - (GIMPLE_STMT_OPERAND (stmt, 0))) + && !ann->has_volatile_ops + && TREE_CODE (GIMPLE_STMT_OPERAND (stmt, 0)) == SSA_NAME + && (!SSA_NAME_OCCURS_IN_ABNORMAL_PHI + (GIMPLE_STMT_OPERAND (stmt, 0))) + && !tree_could_throw_p (stmt)) { if (make_values_for_stmt (stmt, block)) continue; |