From 742d143c1be9352d388e37bb24ff82c81aca8340 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Wed, 20 Oct 2010 11:09:54 +0000 Subject: [PATCH] re PR tree-optimization/45860 (ICE: verify_ssa failed: virtual SSA name for non-VOP decl at -O1) 2010-10-20 Richard Guenther PR tree-optimization/45860 * tree-ssa-phiopt.c (cond_store_replacement): Do not do conditional store replacement for non-register type stores. * gcc.dg/torture/pr45860.c: New testcase. From-SVN: r165718 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr45860.c | 11 +++++++++++ gcc/tree-ssa-phiopt.c | 9 ++++----- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr45860.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a51fad5ed48..4afbaecfd52 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-10-20 Richard Guenther + + PR tree-optimization/45860 + * tree-ssa-phiopt.c (cond_store_replacement): Do not do + conditional store replacement for non-register type stores. + 2010-10-20 Eric Botcazou * stor-layout.c (skip_simple_constant_arithmetic): New function. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 12d4bef3239..25fd7033b85 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-10-20 Richard Guenther + + PR tree-optimization/45860 + * gcc.dg/torture/pr45860.c: New testcase. + 2010-10-20 Eric Botcazou * gnat.dg/discr25.adb: New test. diff --git a/gcc/testsuite/gcc.dg/torture/pr45860.c b/gcc/testsuite/gcc.dg/torture/pr45860.c new file mode 100644 index 00000000000..4a48bc5590e --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr45860.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ + +void +foo (char *str, int i) +{ + static const char text[] = ""; + str[i] = 0; + if (i & 1) + __builtin_strcpy (str + i, text); +} + diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index 482f267a648..8555bc1ef6f 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -1204,10 +1204,11 @@ cond_store_replacement (basic_block middle_bb, basic_block join_bb, || TREE_CODE (TREE_OPERAND (lhs, 0)) != SSA_NAME) return false; - /* RHS is either a single SSA_NAME or a constant. */ + /* RHS is either a single SSA_NAME or a constant of register type. */ code = gimple_assign_rhs_code (assign); if (get_gimple_rhs_class (code) != GIMPLE_SINGLE_RHS - || (code != SSA_NAME && !is_gimple_min_invariant (rhs))) + || (code != SSA_NAME && !is_gimple_min_invariant (rhs)) + || !is_gimple_reg_type (TREE_TYPE (lhs))) return false; /* Prove that we can move the store down. We could also check TREE_THIS_NOTRAP here, but in that case we also could move stores, @@ -1217,8 +1218,8 @@ cond_store_replacement (basic_block middle_bb, basic_block join_bb, /* Now we've checked the constraints, so do the transformation: 1) Remove the single store. */ - mark_symbols_for_renaming (assign); gsi = gsi_for_stmt (assign); + unlink_stmt_vdef (assign); gsi_remove (&gsi, true); /* 2) Create a temporary where we can store the old content @@ -1237,7 +1238,6 @@ cond_store_replacement (basic_block middle_bb, basic_block join_bb, name = make_ssa_name (condstoretemp, new_stmt); gimple_assign_set_lhs (new_stmt, name); gimple_set_location (new_stmt, locus); - mark_symbols_for_renaming (new_stmt); gsi_insert_on_edge (e1, new_stmt); /* 4) Create a PHI node at the join block, with one argument @@ -1249,7 +1249,6 @@ cond_store_replacement (basic_block middle_bb, basic_block join_bb, lhs = unshare_expr (lhs); new_stmt = gimple_build_assign (lhs, PHI_RESULT (newphi)); - mark_symbols_for_renaming (new_stmt); /* 5) Insert that PHI node. */ gsi = gsi_after_labels (join_bb);