re PR tree-optimization/18815 (Tree if-conversion screws up cfg very badly)

PR tree-optimization/18815
       * tree-if-conv.c (combine_blocks): Adjust loop header edges for
       loops with zero exit edges.

From-SVN: r95796
This commit is contained in:
Devang Patel 2005-03-02 11:45:25 -08:00 committed by Devang Patel
parent 270a1283e6
commit ac0bd8018d
2 changed files with 19 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-03-02 Devang Patel <dpatel@apple.com>
PR tree-optimization/18815
* tree-if-conv.c (combine_blocks): Adjust loop header edges for
loops with zero exit edges.
2005-03-02 Kazu Hirata <kazu@cs.umass.edu>
* cfg.c (connect_src, connect_dest, disconnect_src,

View File

@ -905,11 +905,22 @@ combine_blocks (struct loop *loop)
continue;
/* It is time to remove this basic block. First remove edges. */
while (EDGE_COUNT (bb->succs) > 0)
remove_edge (EDGE_SUCC (bb, 0));
while (EDGE_COUNT (bb->preds) > 0)
remove_edge (EDGE_PRED (bb, 0));
/* This is loop latch and loop does not have exit then do not
delete this basic block. Just remove its PREDS and reconnect
loop->header and loop->latch blocks. */
if (bb == loop->latch && loop->num_exits == 0)
{
make_edge (loop->header, loop->latch, EDGE_FALLTHRU);
set_immediate_dominator (CDI_DOMINATORS, loop->latch, loop->header);
continue;
}
while (EDGE_COUNT (bb->succs) > 0)
remove_edge (EDGE_SUCC (bb, 0));
/* Remove labels and make stmts member of loop->header. */
for (bsi = bsi_start (bb); !bsi_end_p (bsi); )
{