aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-ssa-tail-merge.c
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2012-08-02 09:43:14 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2012-08-02 09:43:14 +0000
commitfcddd80e2efd57253335eb33d4e35fb47a4a0e20 (patch)
tree6eb8077b726a7da082b816374813da18c0ff6f41 /gcc/tree-ssa-tail-merge.c
parentb6a45605019bfe2fe588961c6959630f8b9deed0 (diff)
downloadgcc-fcddd80e2efd57253335eb33d4e35fb47a4a0e20.zip
gcc-fcddd80e2efd57253335eb33d4e35fb47a4a0e20.tar.gz
gcc-fcddd80e2efd57253335eb33d4e35fb47a4a0e20.tar.bz2
re PR tree-optimization/50672 (ice: verify_ssa failed: no immediate_use list)
2012-08-02 Richard Guenther <rguenther@suse.de> PR tree-optimization/50672 Revert 2012-08-01 Richard Guenther <rguenther@suse.de> * tree-ssa-tail-merge.c (release_last_vdef): Remove. (replace_block_by): Adjust. * g++.dg/torture/pr50672.C: New testcase. From-SVN: r190070
Diffstat (limited to 'gcc/tree-ssa-tail-merge.c')
-rw-r--r--gcc/tree-ssa-tail-merge.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index ab37336..a2d4633 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -812,6 +812,37 @@ same_succ_flush_bbs (bitmap bbs)
same_succ_flush_bb (BASIC_BLOCK (i));
}
+/* Release the last vdef in BB, either normal or phi result. */
+
+static void
+release_last_vdef (basic_block bb)
+{
+ gimple_stmt_iterator i;
+
+ for (i = gsi_last_bb (bb); !gsi_end_p (i); gsi_prev_nondebug (&i))
+ {
+ gimple stmt = gsi_stmt (i);
+ if (gimple_vdef (stmt) == NULL_TREE)
+ continue;
+
+ mark_virtual_operand_for_renaming (gimple_vdef (stmt));
+ return;
+ }
+
+ for (i = gsi_start_phis (bb); !gsi_end_p (i); gsi_next (&i))
+ {
+ gimple phi = gsi_stmt (i);
+ tree res = gimple_phi_result (phi);
+
+ if (is_gimple_reg (res))
+ continue;
+
+ mark_virtual_phi_result_for_renaming (phi);
+ return;
+ }
+
+}
+
/* For deleted_bb_preds, find bbs with same successors. */
static void
@@ -1446,6 +1477,7 @@ replace_block_by (basic_block bb1, basic_block bb2)
bb1->frequency = 0;
/* Do updates that use bb1, before deleting bb1. */
+ release_last_vdef (bb1);
same_succ_flush_bb (bb1);
delete_basic_block (bb1);