fix bugs when exchanging nodes to projs in bepeephole

[libfirm] / ir / be / beirgmod.c

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 301234e..86b3914 100644 (file)
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -88,30 +88,33 @@ ir_node *insert_Perm_after(be_irg_t *birg,
        be_lv_t *lv     = birg->lv;
        ir_node *bl     = is_Block(pos) ? pos : get_nodes_block(pos);
        ir_graph *irg   = get_irn_irg(bl);
-       pset *live      = pset_new_ptr_default();
+       ir_nodeset_t          live;
+       ir_nodeset_iterator_t iter;
 
        ir_node *curr, *irn, *perm, **nodes;
-       int i, n;
+       size_t i, n;
 
        DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
 
-       be_liveness_nodes_live_at(lv, arch_env, cls, pos, live);
-
-       n = pset_count(live);
+       ir_nodeset_init(&live);
+       be_liveness_nodes_live_at(lv, arch_env, cls, pos, &live);
 
+       n = ir_nodeset_size(&live);
        if(n == 0) {
-               del_pset(live);
+               ir_nodeset_destroy(&live);
                return NULL;
        }
 
        nodes = xmalloc(n * sizeof(nodes[0]));
 
        DBG((dbg, LEVEL_1, "live:\n"));
-       for(irn = pset_first(live), i = 0; irn; irn = pset_next(live), i++) {
+       i = 0;
+       foreach_ir_nodeset(&live, irn, iter) {
                DBG((dbg, LEVEL_1, "\t%+F\n", irn));
                nodes[i] = irn;
+               i++;
        }
-       del_pset(live);
+       ir_nodeset_destroy(&live);
 
        perm = be_new_Perm(cls, irg, bl, n, nodes);
        sched_add_after(pos, perm);
@@ -127,7 +130,6 @@ ir_node *insert_Perm_after(be_irg_t *birg,
                ir_node *proj = new_r_Proj(irg, bl, perm, mode, i);
                arch_set_irn_register(arch_env, proj, reg);
 
-               sched_add_after(curr, proj);
                curr = proj;
 
                be_ssa_construction_init(&senv, birg);
@@ -150,6 +152,8 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 static void remove_empty_block(ir_node *block, void *data) {
        const ir_edge_t *edge, *next;
        ir_node *node;
+       ir_node *pred_block;
+       ir_node *succ_block;
        int *changed = data;
        ir_node *jump = NULL;
 
@@ -163,7 +167,7 @@ static void remove_empty_block(ir_node *block, void *data) {
                        return;
                if (jump != NULL) {
                        /* we should never have 2 jumps in a block */
-                       panic("We should never have 2 jumps in a block");
+                       panic("found 2 jumps in a block");
                }
                jump = node;
        }
@@ -171,12 +175,30 @@ static void remove_empty_block(ir_node *block, void *data) {
        if (jump == NULL)
                return;
 
-       node = get_Block_cfgpred(block, 0);
+       pred_block = get_Block_cfgpred(block, 0);
+       succ_block = NULL;
        foreach_out_edge_safe(jump, edge, next) {
-               ir_node *block = get_edge_src_irn(edge);
-               int     pos    = get_edge_src_pos(edge);
+               int pos = get_edge_src_pos(edge);
+
+               assert(succ_block == NULL);
+               succ_block = get_edge_src_irn(edge);
+
+               set_irn_n(succ_block, pos, pred_block);
+       }
+
+       /* there can be some non-scheduled Pin nodes left in the block, move them
+        * to the succ block */
+       foreach_out_edge_safe(block, edge, next) {
+               node = get_edge_src_irn(edge);
 
-               set_irn_n(block, pos, node);
+               if(node == jump)
+                       continue;
+               if(is_Pin(node)) {
+                       set_nodes_block(node, succ_block);
+                       continue;
+               }
+               panic("Unexpected node %+F in block %+F with empty schedule", node,
+                     block);
        }
 
        set_Block_cfgpred(block, 0, new_Bad());