From b5564e87d4237cd8fd1d926dcee6df27707e87f7 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 14 Mar 2006 12:50:10 +0000 Subject: [PATCH] re PR tree-optimization/26672 (ICE in op_iter_init, triggered by printf->puts optimization) 2006-03-14 Richard Guenther PR tree-optimization/26672 * tree-ssa-propagate.c (set_rhs): Don't walk DEFs if not in SSA form. * gcc.dg/torture/pr26672.c: New testcase. From-SVN: r112050 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr26672.c | 8 ++++++++ gcc/tree-ssa-propagate.c | 3 ++- 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr26672.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 63d589b0e7b..813e37d6954 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-03-14 Richard Guenther + + PR tree-optimization/26672 + * tree-ssa-propagate.c (set_rhs): Don't walk DEFs if not in + SSA form. + 2006-03-14 Richard Guenther PR tree-optimization/26667 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5d89febca76..e955f5ef9dd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-03-14 Richard Guenther + + PR tree-optimization/26672 + * gcc.dg/torture/pr26672.c: New testcase. + 2006-03-14 Joseph S. Myers * gcc.target/powerpc/405-dlmzb-strlen-1.c, diff --git a/gcc/testsuite/gcc.dg/torture/pr26672.c b/gcc/testsuite/gcc.dg/torture/pr26672.c new file mode 100644 index 00000000000..b13b5dcaef7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr26672.c @@ -0,0 +1,8 @@ +/* { dg-do compile } */ + +int printf(const char *format, ...); +extern const char help_string[]; +void app_opts(void) { + printf("%s", help_string); +} +const char help_string[] = "foo\n"; diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c index dcdc6add4dd..00d5a945889 100644 --- a/gcc/tree-ssa-propagate.c +++ b/gcc/tree-ssa-propagate.c @@ -632,7 +632,8 @@ set_rhs (tree *stmt_p, tree expr) *stmt_p = TREE_SIDE_EFFECTS (expr) ? expr : build_empty_stmt (); (*stmt_p)->common.ann = (tree_ann_t) ann; - if (TREE_SIDE_EFFECTS (expr)) + if (in_ssa_p + && TREE_SIDE_EFFECTS (expr)) { /* Fix all the SSA_NAMEs created by *STMT_P to point to its new replacement. */