handle Block_entity like other node attributes

[libfirm] / ir / be / beirgmod.c

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 6c19e88..0cfb3f4 100644 (file)
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -22,7 +22,6 @@
  * @brief       Backend IRG modification routines.
  * @author      Sebastian Hack, Daniel Grund, Matthias Braun, Christian Wuerdig
  * @date        04.05.2005
- * @version     $Id$
  *
  * This file contains the following IRG modifications for be routines:
  * - insertion of Perm nodes
@@ -87,7 +86,7 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
        ir_nodeset_t          live;
        ir_nodeset_iterator_t iter;
 
-       ir_node *curr, *irn, *perm, **nodes;
+       ir_node *irn, *perm, **nodes;
        size_t i, n;
 
        DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
@@ -116,7 +115,6 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
        sched_add_after(pos, perm);
        free(nodes);
 
-       curr = perm;
        for (i = 0; i < n; ++i) {
                ir_node *perm_op = get_irn_n(perm, i);
                const arch_register_t *reg = arch_get_irn_register(perm_op);
@@ -126,8 +124,6 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
                ir_node *proj = new_r_Proj(perm, mode, i);
                arch_set_irn_register(proj, reg);
 
-               curr = proj;
-
                be_ssa_construction_init(&senv, irg);
                be_ssa_construction_add_copy(&senv, perm_op);
                be_ssa_construction_add_copy(&senv, proj);
@@ -165,7 +161,7 @@ static void remove_empty_block(ir_node *block)
 
        sched_foreach(block, node) {
                if (! is_Jmp(node)
-                               && !(arch_irn_get_flags(node) & arch_irn_flags_simple_jump))
+                               && !(arch_get_irn_flags(node) & arch_irn_flags_simple_jump))
                        goto check_preds;
                if (jump != NULL) {
                        /* we should never have 2 jumps in a block */
@@ -184,7 +180,8 @@ static void remove_empty_block(ir_node *block)
 
                assert(succ_block == NULL);
                succ_block = get_edge_src_irn(edge);
-               if (has_Block_entity(succ_block) && has_Block_entity(block)) {
+               if (get_Block_entity(succ_block) != NULL
+                   && get_Block_entity(block) != NULL) {
                        /*
                         * Currently we can add only one label for a block.
                         * Therefore we cannot combine them if  both block already have one.
@@ -195,7 +192,7 @@ static void remove_empty_block(ir_node *block)
                set_irn_n(succ_block, pos, pred);
        }
 
-       if (has_Block_entity(block)) {
+       if (get_Block_entity(block) != NULL) {
                /* move the label to the successor block */
                ir_entity *entity = get_Block_entity(block);
                set_Block_entity(succ_block, entity);
@@ -266,9 +263,8 @@ int be_remove_empty_blocks(ir_graph *irg)
 
        if (blocks_removed) {
                /* invalidate analysis info */
-               set_irg_doms_inconsistent(irg);
-               set_irg_extblk_inconsistent(irg);
-               set_irg_loopinfo_inconsistent(irg);
+               clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE
+                                  | IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS);
        }
        return blocks_removed;
 }