From 9a2875939a850fb4415199ea68902e3dc2403b45 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 1 Oct 2007 20:39:03 +0000 Subject: [PATCH] tree-ssa-sink.c (sink_code_in_bb): Don't stop sinking after sinking the last stmt in a BB. * tree-ssa-sink.c (sink_code_in_bb): Don't stop sinking after sinking the last stmt in a BB. From-SVN: r128913 --- gcc/ChangeLog | 5 +++++ gcc/tree-ssa-sink.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3c6aa3d0390b..45344244cce7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2007-10-01 Alexandre Oliva + + * tree-ssa-sink.c (sink_code_in_bb): Don't stop sinking after + sinking the last stmt in a BB. + 2007-10-01 Alexandre Oliva PR middle-end/22156 diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c index b70d082ba990..cd57baa0d99b 100644 --- a/gcc/tree-ssa-sink.c +++ b/gcc/tree-ssa-sink.c @@ -433,6 +433,7 @@ sink_code_in_bb (basic_block bb) block_stmt_iterator bsi; edge_iterator ei; edge e; + bool last = true; /* If this block doesn't dominate anything, there can't be any place to sink the statements to. */ @@ -454,6 +455,7 @@ sink_code_in_bb (basic_block bb) { if (!bsi_end_p (bsi)) bsi_prev (&bsi); + last = false; continue; } if (dump_file) @@ -472,6 +474,19 @@ sink_code_in_bb (basic_block bb) bsi_move_before (&bsi, &tobsi); sink_stats.sunk++; + + /* If we've just removed the last statement of the BB, the + bsi_end_p() test below would fail, but bsi_prev() would have + succeeded, and we want it to succeed. So we keep track of + whether we're at the last statement and pick up the new last + statement. */ + if (last) + { + bsi = bsi_last (bb); + continue; + } + + last = false; if (!bsi_end_p (bsi)) bsi_prev (&bsi); -- 2.47.2