used new assure_doms()

[libfirm] / ir / ir / irgmod.c

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 9c92242..260e2a8 100644 (file)
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -40,8 +40,10 @@ turn_into_tuple (ir_node *node, int arity)
   } else {
     /* Allocate new array, don't free old in_array, it's on the obstack. */
     ir_node *block = get_nodes_block(node);
-    node->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, arity+1);
-               edges_invalidate(node, current_ir_graph);
+    edges_invalidate(node, current_ir_graph);
+    node->in = NEW_ARR_D(ir_node *, current_ir_graph->obst, arity+1);
+    /* clear the new in array, else edge_notify tries to delete garbage */
+    memset(node->in, 0, (arity+1) * sizeof(node->in[0]));
     set_nodes_block(node, block);
   }
 }
@@ -52,6 +54,8 @@ turn_into_tuple (ir_node *node, int arity)
 void
 exchange (ir_node *old, ir_node *nw)
 {
+  hook_replace(old, nw);
+
   /*
    * If new outs are on, we can skip the id node creation and reroute
    * the edges from the old node to the new directly.
@@ -76,9 +80,9 @@ exchange (ir_node *old, ir_node *nw)
       block = is_Block(nw) ? nw : get_nodes_block(nw);
 
       if (!block) {
-       DDMN(old);
-       DDMN(nw);
-       assert(0 && "cannot find legal block for id");
+        DDMN(old);
+        DDMN(nw);
+        assert(0 && "cannot find legal block for id");
       }
     }
 
@@ -173,9 +177,8 @@ void part_block(ir_node *node) {
             get_Block_cfgpred_arr(old_block));
   set_irg_current_block(current_ir_graph, new_block);
   {
-    ir_node *in[1];
-    in[0] = new_Jmp();
-    set_irn_in(old_block, 1, in);
+    ir_node *jmp = new_Jmp();
+    set_irn_in(old_block, 1, &jmp);
     irn_vrfy_irg(old_block, current_ir_graph);
   }