From 52dfd149bd1a8babe28c3a8a22d7f7db321276ad Mon Sep 17 00:00:00 2001 From: dnovillo Date: Sun, 30 Sep 2007 16:00:36 +0000 Subject: [PATCH] PR 33593 * tree-ssa-ter.c (is_replaceable_p): Return false if STMT may throw an exception. testsuite/ChangeLog PR 33593 * g++.dg/tree-ssa/pr33593.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128893 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/tree-ssa/pr33593.C | 19 +++++++++++++++++++ gcc/tree-ssa-ter.c | 4 ++++ 4 files changed, 34 insertions(+) create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr33593.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ea66227391a..eef9e94799b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-09-30 Diego Novillo + + PR 33593 + * tree-ssa-ter.c (is_replaceable_p): Return false if STMT may + throw an exception. + 2007-09-30 Uros Bizjak PR tree-optimization/33597 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 45a3afbe9de..631e8a1ba7d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-09-30 Diego Novillo + + PR 33593 + * g++.dg/tree-ssa/pr33593.C: New test. + 2007-09-30 Jerry DeLisle PR libfortran/33400 diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr33593.C b/gcc/testsuite/g++.dg/tree-ssa/pr33593.C new file mode 100644 index 00000000000..f5497407ff8 --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr33593.C @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fnon-call-exceptions -fdump-tree-optimized" } */ + +#include + +void foo (int) { printf ("Bar\n"); } + +int +main (void) +{ + int a = 1 / 0; // { dg-warning "division by zero" } + printf ("Foo\n"); + foo (a); +} + +// The expression 1 / 0 should not be propagated into the call to foo() if it +// may trap. +// { dg-final { scan-tree-dump-times "foo \\(1 \\/ 0\\)" 0 "optimized" } } +// { dg-final { cleanup-tree-dump "optimized" } } diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c index 824252e8b9f..f0fef24aa4a 100644 --- a/gcc/tree-ssa-ter.c +++ b/gcc/tree-ssa-ter.c @@ -366,6 +366,10 @@ is_replaceable_p (tree stmt) if (TREE_CODE (stmt) != GIMPLE_MODIFY_STMT) return false; + /* If the statement may throw an exception, it cannot be replaced. */ + if (tree_could_throw_p (stmt)) + return false; + /* Punt if there is more than 1 def. */ def = SINGLE_SSA_TREE_OPERAND (stmt, SSA_OP_DEF); if (!def) -- 2.11.0