X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=39f255c8cf15b8a7cb0a60289253b91fbcef10ba;hb=8399216d8aebc713bbda04b6e3e250a1d52b20bf;hp=0c7c4cbf87d7bc290fcfac97bf47590490648642;hpb=848d0115fd522d38b810a94e9874d2359adfa4be;p=libfirm

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 0c7c4cbf8..39f255c8c 100644
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 # include "irvrfy.h"
@@ -37,9 +37,9 @@ turn_into_tuple (ir_node *node, int arity)
     /* keep old array */
   } else {
     /* Allocate new array, don't free old in_array, it's on the obstack. */
-    ir_node *block = get_nodes_Block(node);
+    ir_node *block = get_nodes_block(node);
     node->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, arity+1);
-    set_nodes_Block(node, block);
+    set_nodes_block(node, block);
   }
 }
 
@@ -52,12 +52,18 @@ exchange (ir_node *old, ir_node *nw)
   ir_node *block;
   ir_graph *irg = get_irn_irg (old);
 
+  assert(old != nw);
   assert (irg);
   assert(get_irn_op(old)->opar != oparity_dynamic);
 
   stat_turn_into_id(old);
 
   block = old->in[0];
+  if (!block) {
+    if (is_Block(nw)) block = nw;
+    else (block = nw->in[0]);
+    if (!block) { DDMN(old); DDMN(nw); assert(0 && "cannot find legal block for id"); }
+  }
 
   old->op = op_Id;
   old->in = NEW_ARR_D (ir_node *, irg->obst, 2);
@@ -78,8 +84,8 @@ static void
 collect (ir_node *n, void *env) {
   ir_node *pred;
   if (get_irn_op(n) == op_Phi) {
-    set_irn_link(n, get_irn_link(get_nodes_Block(n)));
-    set_irn_link(get_nodes_Block(n), n);
+    set_irn_link(n, get_irn_link(get_nodes_block(n)));
+    set_irn_link(get_nodes_block(n), n);
   }
   if (get_irn_op(n) == op_Proj) {
     pred = n;
@@ -112,18 +118,18 @@ void collect_phiprojs(ir_graph *irg) {
  * Does not move predecessors of Phi nodes (or block nodes).
  */
 static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
-  int i;
+  int i, arity;
   ir_node *proj, *pred;
 
   /* move this node */
-  set_nodes_Block(node, to_bl);
+  set_nodes_block(node, to_bl);
 
   /* move its projs */
   if (get_irn_mode(node) == mode_T) {
     proj = get_irn_link(node);
     while (proj) {
-      if (get_nodes_Block(proj) == from_bl)
-    set_nodes_Block(proj, to_bl);
+      if (get_nodes_block(proj) == from_bl)
+	set_nodes_block(proj, to_bl);
       proj = get_irn_link(proj);
     }
   }
@@ -131,9 +137,10 @@ static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
   /* recursion ... */
   if (get_irn_op(node) == op_Phi) return;
 
-  for (i = 0; i < get_irn_arity(node); i++) {
+  arity = get_irn_arity(node);
+  for (i = 0; i < arity; i++) {
     pred = get_irn_n(node, i);
-    if (get_nodes_Block(pred) == from_bl)
+    if (get_nodes_block(pred) == from_bl)
       move(pred, from_bl, to_bl);
   }
 }
@@ -148,7 +155,7 @@ void part_block(ir_node *node) {
   set_optimize(0);
 
   /* Transform the control flow */
-  old_block = get_nodes_Block(node);
+  old_block = get_nodes_block(node);
   new_block = new_Block(get_Block_n_cfgpreds(old_block),
             get_Block_cfgpred_arr(old_block));
   set_irg_current_block(current_ir_graph, new_block);
@@ -167,10 +174,10 @@ void part_block(ir_node *node) {
   set_irn_link(new_block, phi);
   set_irn_link(old_block, NULL);
   while (phi) {
-    if(get_nodes_Block(phi) == old_block);   /* @@@ inlinening chokes on phis that don't
+    if(get_nodes_block(phi) == old_block);   /* @@@ inlinening chokes on phis that don't
                            obey this condition.  How do they get into
                            the list??? Example: InterfaceIII */
-      set_nodes_Block(phi, new_block);
+      set_nodes_block(phi, new_block);
     phi = get_irn_link(phi);
   }