From 227c4bc7af8e39d24f3f9ba96037c0254720075d Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Fri, 8 Oct 2004 23:25:49 +0000 Subject: [PATCH] re PR tree-optimization/17902 (ICE from tree_verify_flow_info) 2004-10-08 Andrew Pinski PR tree-opt/17902 * tree-ssa-phiopt.c (conditional_replacement): Use bsi_after_labels instead of bsi_start. (value_replacement): Likewise. (abs_replacement): Likewise From-SVN: r88801 --- gcc/ChangeLog | 8 ++++++++ gcc/tree-ssa-phiopt.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 078ee82..8f9daf8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-10-08 Andrew Pinski + + PR tree-opt/17902 + * tree-ssa-phiopt.c (conditional_replacement): Use bsi_after_labels + instead of bsi_start. + (value_replacement): Likewise. + (abs_replacement): Likewise + 2004-10-09 Steven Bosscher * cfgexpand.c (maybe_dump_rtl_for_tree_stmt): New function. diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index 7c38b8a..2b415a6 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -332,7 +332,7 @@ conditional_replacement (basic_block bb, tree phi, tree arg0, tree arg1) extract_true_false_edges_from_block (cond_block, &true_edge, &false_edge); /* Insert our new statement at the head of our block. */ - bsi = bsi_start (bb); + bsi = bsi_after_labels (bb); if (old_result) { @@ -485,7 +485,7 @@ value_replacement (basic_block bb, tree phi, tree arg0, tree arg1) /* Build the new assignment. */ new = build (MODIFY_EXPR, TREE_TYPE (result), result, arg); - replace_phi_with_stmt (bsi_start (bb), bb, cond_block, phi, new); + replace_phi_with_stmt (bsi_after_labels (bb), bb, cond_block, phi, new); /* Note that we optimized this PHI. */ return true; @@ -621,7 +621,7 @@ abs_replacement (basic_block bb, tree phi, tree arg0, tree arg1) new = build (MODIFY_EXPR, TREE_TYPE (lhs), lhs, build1 (ABS_EXPR, TREE_TYPE (lhs), rhs)); - replace_phi_with_stmt (bsi_start (bb), bb, cond_block, phi, new); + replace_phi_with_stmt (bsi_after_labels (bb), bb, cond_block, phi, new); if (negate) { -- 2.7.4