Make warning about registers assigned to Phi inputs more clear.

[libfirm] / ir / be / betranshlp.c

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index 8d80986..4da063b 100644 (file)
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -65,8 +65,12 @@ int be_is_transformed(const ir_node *node) {
 }
 
 static INLINE ir_node *be_get_transformed_node(ir_node *old_node) {
-       assert(irn_visited(old_node));
-       return (ir_node*) get_irn_link(old_node);
+       if (irn_visited(old_node)) {
+               ir_node *new_node = get_irn_link(old_node);
+               assert(new_node != NULL);
+               return new_node;
+       }
+       return NULL;
 }
 
 void be_duplicate_deps(ir_node *old_node, ir_node *new_node) {
@@ -122,14 +126,11 @@ ir_node *be_duplicate_node(ir_node *node) {
  * Calls transformation function for given node and marks it visited.
  */
 ir_node *be_transform_node(ir_node *node) {
-       ir_node *new_node;
        ir_op   *op;
+       ir_node *new_node = be_get_transformed_node(node);
 
-       if (irn_visited(node)) {
-               new_node = be_get_transformed_node(node);
-               assert(new_node != NULL);
+       if (new_node != NULL)
                return new_node;
-       }
 
        mark_irn_visited(node);
        DEBUG_ONLY(be_set_transformed_node(node, NULL));
@@ -320,7 +321,7 @@ static void transform_nodes(ir_graph *irg, arch_pretrans_nodes *pre_transform,
                fix_loops(anchor);
                set_irn_n(new_anchor, i, anchor);
        }
-       set_irn_n(new_anchor, -1, get_irg_anchor(irg, anchor_end_block));
+       set_nodes_block(new_anchor, get_irg_anchor(irg, anchor_end_block));
 
        del_waitq(env.worklist);
        free_End(old_end);
@@ -355,10 +356,10 @@ static ir_node *gen_Block(ir_node *node) {
 #endif
        if (node == macroblock) {
                /* this node is a macroblock header */
-               set_irn_n(block, -1, block);
+               set_Block_MacroBlock(block, block);
        } else {
                macroblock = be_transform_node(macroblock);
-               set_irn_n(block, -1, macroblock);
+               set_Block_MacroBlock(block, macroblock);
        }
 
        be_set_transformed_node(node, block);
@@ -423,9 +424,6 @@ void be_transform_graph(be_irg_t *birg, arch_pretrans_nodes *func, void *cg)
        /* do the main transformation */
        transform_nodes(irg, func, cg);
 
-       /* we don't want the globals anchor anymore */
-       set_irg_globals(irg, new_r_Bad(irg));
-
        /* free the old obstack */
        obstack_free(old_obst, 0);
        xfree(old_obst);