From fca2aa676599d1c16b1e5a95fb8bac7bef0232af Mon Sep 17 00:00:00 2001 From: rguenth Date: Fri, 10 May 2013 12:20:36 +0000 Subject: [PATCH] 2013-05-10 Richard Biener PR tree-optimization/57214 * tree-ssa-loop-ivcanon.c (propagate_constants_for_unrolling): Do not propagate from SSA names that occur in abnormal PHI nodes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198773 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.dg/torture/pr57214.c | 25 +++++++++++++++++++++++++ gcc/tree-ssa-loop-ivcanon.c | 3 ++- 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr57214.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bdc8bc50e10..8980e5e199c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-05-10 Richard Biener + + PR tree-optimization/57214 + * tree-ssa-loop-ivcanon.c (propagate_constants_for_unrolling): Do + not propagate from SSA names that occur in abnormal PHI nodes. + 2013-05-10 Marc Glisse * stor-layout.c (element_precision): New function. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d8e13548d96..6ab94b216f7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-05-10 Richard Biener + + PR tree-optimization/57214 + * tree-ssa-loop-ivcanon.c (propagate_constants_for_unrolling): Do + not propagate from SSA names that occur in abnormal PHI nodes. + 2013-05-10 Marc Glisse * gcc.dg/vector-shift.c: New testcase. diff --git a/gcc/testsuite/gcc.dg/torture/pr57214.c b/gcc/testsuite/gcc.dg/torture/pr57214.c new file mode 100644 index 00000000000..d51067d95d8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr57214.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ + +extern int baz (void); +extern int foo (void) __attribute__ ((returns_twice)); + +void +bar (_Bool b) +{ + int buf[1]; + while (1) + { + _Bool x = 1; + if (b) + baz (); + b = 1; + baz (); + x = 0; + int i; + while (buf[i] && i) + i++; + foo (); + if (!x) + b = 0; + } +} diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c index c57e4f6a30d..b5751cb7f7f 100644 --- a/gcc/tree-ssa-loop-ivcanon.c +++ b/gcc/tree-ssa-loop-ivcanon.c @@ -1085,8 +1085,9 @@ propagate_constants_for_unrolling (basic_block bb) tree lhs; if (is_gimple_assign (stmt) + && gimple_assign_rhs_code (stmt) == INTEGER_CST && (lhs = gimple_assign_lhs (stmt), TREE_CODE (lhs) == SSA_NAME) - && gimple_assign_rhs_code (stmt) == INTEGER_CST) + && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (lhs)) { propagate_into_all_uses (lhs, gimple_assign_rhs1 (stmt)); gsi_remove (&gsi, true); -- 2.11.4.GIT