fehler109

[libfirm] / ir / be / betranshlp.c

diff --git a/ir/be/betranshlp.c b/ir/be/betranshlp.c
index 79e7421..20551c2 100644 (file)
--- a/ir/be/betranshlp.c
+++ b/ir/be/betranshlp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -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));
@@ -334,6 +335,7 @@ static ir_node *gen_Block(ir_node *node) {
        ir_graph *irg             = current_ir_graph;
        dbg_info *dbgi            = get_irn_dbg_info(node);
        ir_node  *old_start_block = get_irn_n(env.old_anchor, anchor_start_block);
+       ir_node  *macroblock      = get_Block_MacroBlock(node);
        ir_node  *block;
 
        /*
@@ -349,10 +351,17 @@ static ir_node *gen_Block(ir_node *node) {
        block = new_ir_node(dbgi, irg, NULL, get_irn_op(node), get_irn_mode(node),
                            get_irn_arity(node), get_irn_in(node) + 1);
        copy_node_attr(node, block);
-
 #ifdef DEBUG_libfirm
        block->node_nr = node->node_nr;
 #endif
+       if (node == macroblock) {
+               /* this node is a macroblock header */
+               set_irn_n(block, -1, block);
+       } else {
+               macroblock = be_transform_node(macroblock);
+               set_irn_n(block, -1, macroblock);
+       }
+
        be_set_transformed_node(node, block);
 
        /* put the preds in the worklist */