cleanup: Remove pointless assert(is_${NODE}(x)) just before get_${NODE}_${FOO}(x...
[libfirm] / ir / ana / irdom.c
index 0063f4f..2b98e13 100644 (file)
@@ -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.
  *
  * @brief     Construct and access dominator / post dominator tree.
  * @author    Goetz Lindenmaier, Michael Beck, Rubino Geiss
  * @date      2.2002
- * @version   $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
 #include "irouts.h"
 
 #include "xmalloc.h"
 #include "irgwalk.h"
 #include "irdom_t.h"
-#include "irgraph_t.h"   /* To access state field. */
+#include "irgraph_t.h"
 #include "irnode_t.h"
 #include "ircons_t.h"
-#include "array.h"
+#include "array_t.h"
 #include "iredges.h"
 
 
 #define get_dom_info(bl)  (&(bl)->attr.block.dom)
 #define get_pdom_info(bl) (&(bl)->attr.block.pdom)
 
-/*--------------------------------------------------------------------*/
-/** Accessing the dominator and post dominator data structures       **/
-/*--------------------------------------------------------------------*/
-
-ir_node *get_Block_idom(const ir_node *bl) {
-       assert(is_Block(bl));
+ir_node *get_Block_idom(const ir_node *bl)
+{
        if (get_Block_dom_depth(bl) == -1) {
                /* This block is not reachable from Start */
-               return new_Bad();
+               ir_graph *irg = get_irn_irg(bl);
+               return new_r_Bad(irg, mode_BB);
        }
        return get_dom_info(bl)->idom;
 }
 
-void set_Block_idom(ir_node *bl, ir_node *n) {
+void set_Block_idom(ir_node *bl, ir_node *n)
+{
        ir_dom_info *bli = get_dom_info(bl);
 
-       assert(get_irn_op(bl) == op_Block);
+       assert(is_Block(bl));
 
        /* Set the immediate dominator of bl to n */
        bli->idom = n;
@@ -72,7 +65,7 @@ void set_Block_idom(ir_node *bl, ir_node *n) {
         * If we don't set the root of the dominator tree
         * Append bl to the dominates queue of n.
         */
-       if(n != NULL) {
+       if (n != NULL) {
                ir_dom_info *ni = get_dom_info(n);
 
                bli->next = ni->first;
@@ -80,19 +73,21 @@ void set_Block_idom(ir_node *bl, ir_node *n) {
        }
 }
 
-ir_node *get_Block_ipostdom(const ir_node *bl) {
-       assert(is_Block(bl));
+ir_node *get_Block_ipostdom(const ir_node *bl)
+{
        if (get_Block_postdom_depth(bl) == -1) {
                /* This block is not reachable from Start */
-               return new_Bad();
+               ir_graph *irg = get_irn_irg(bl);
+               return new_r_Bad(irg, mode_BB);
        }
        return get_pdom_info(bl)->idom;
 }
 
-void set_Block_ipostdom(ir_node *bl, ir_node *n) {
+void set_Block_ipostdom(ir_node *bl, ir_node *n)
+{
        ir_dom_info *bli = get_pdom_info(bl);
 
-       assert(get_irn_op(bl) == op_Block);
+       assert(is_Block(bl));
 
        /* Set the immediate post dominator of bl to n */
        bli->idom = n;
@@ -101,7 +96,7 @@ void set_Block_ipostdom(ir_node *bl, ir_node *n) {
         * If we don't set the root of the post dominator tree
         * Append bl to the post dominates queue of n.
         */
-       if(n != NULL) {
+       if (n != NULL) {
                ir_dom_info *ni = get_pdom_info(n);
 
                bli->next = ni->first;
@@ -109,44 +104,52 @@ void set_Block_ipostdom(ir_node *bl, ir_node *n) {
        }
 }
 
-int get_Block_dom_pre_num(const ir_node *bl) {
-       assert(get_irn_op(bl) == op_Block);
+int get_Block_dom_pre_num(const ir_node *bl)
+{
+       assert(is_Block(bl));
        return get_dom_info(bl)->pre_num;
 }
 
-void set_Block_dom_pre_num(ir_node *bl, int num) {
-       assert(get_irn_op(bl) == op_Block);
+void set_Block_dom_pre_num(ir_node *bl, int num)
+{
+       assert(is_Block(bl));
        get_dom_info(bl)->pre_num = num;
 }
 
-int get_Block_dom_depth(const ir_node *bl) {
-       assert(get_irn_op(bl) == op_Block);
+int get_Block_dom_depth(const ir_node *bl)
+{
+       assert(is_Block(bl));
        return get_dom_info(bl)->dom_depth;
 }
 
-void set_Block_dom_depth(ir_node *bl, int depth) {
-       assert(get_irn_op(bl) == op_Block);
+void set_Block_dom_depth(ir_node *bl, int depth)
+{
+       assert(is_Block(bl));
        get_dom_info(bl)->dom_depth = depth;
 }
 
 
-int get_Block_postdom_pre_num(const ir_node *bl) {
-       assert(get_irn_op(bl) == op_Block);
+int get_Block_postdom_pre_num(const ir_node *bl)
+{
+       assert(is_Block(bl));
        return get_pdom_info(bl)->pre_num;
 }
 
-void set_Block_postdom_pre_num(ir_node *bl, int num) {
-       assert(get_irn_op(bl) == op_Block);
+void set_Block_postdom_pre_num(ir_node *bl, int num)
+{
+       assert(is_Block(bl));
        get_pdom_info(bl)->pre_num = num;
 }
 
-int get_Block_postdom_depth(const ir_node *bl) {
-       assert(get_irn_op(bl) == op_Block);
+int get_Block_postdom_depth(const ir_node *bl)
+{
+       assert(is_Block(bl));
        return get_pdom_info(bl)->dom_depth;
 }
 
-void set_Block_postdom_depth(ir_node *bl, int depth) {
-       assert(get_irn_op(bl) == op_Block);
+void set_Block_postdom_depth(ir_node *bl, int depth)
+{
+       assert(is_Block(bl));
        get_pdom_info(bl)->dom_depth = depth;
 }
 
@@ -174,7 +177,6 @@ unsigned get_Block_pdom_max_subtree_pre_num(const ir_node *bl)
        return get_pdom_info(bl)->max_subtree_pre_num;
 }
 
-/* Check, if a block dominates another block. */
 int block_dominates(const ir_node *a, const ir_node *b)
 {
        const ir_dom_info *ai, *bi;
@@ -189,7 +191,11 @@ int block_dominates(const ir_node *a, const ir_node *b)
        return 0;
 }
 
-/* Returns the smallest common dominator block of two nodes. */
+int block_strictly_dominates(const ir_node *a, const ir_node *b)
+{
+       return (a != b) && block_dominates(a, b);
+}
+
 ir_node *node_smallest_common_dominator(ir_node *a, ir_node *b)
 {
        ir_node *bl_a   = is_Block(a) ? a : get_nodes_block(a);
@@ -217,64 +223,6 @@ ir_node *node_smallest_common_dominator(ir_node *a, ir_node *b)
        return dom_bl;
 }
 
-/* Returns the smallest common dominator block of all users of a node. */
-ir_node *node_users_smallest_common_dominator(ir_node *irn, int handle_phi)
-{
-       int n, j, i = 0, success;
-       ir_node **user_blocks, *dom_bl;
-       const ir_edge_t *edge;
-
-       assert(! is_Block(irn) && "WRONG USAGE of node_users_smallest_common_dominator");
-       assert(edges_activated(get_irn_irg(irn)) && "need edges activated");
-
-       n = get_irn_n_edges(irn);
-
-       /* get array to hold all block of the node users */
-       NEW_ARR_A(ir_node *, user_blocks, n);
-       foreach_out_edge(irn, edge) {
-               ir_node *src = get_edge_src_irn(edge);
-
-               if (is_Phi(src) && handle_phi) {
-                       /* get the corresponding cfg predecessor block if phi handling requested */
-                       j  = get_edge_src_pos(edge);
-                       assert(j >= 0 && "kaputt");
-                       user_blocks[i++] = get_Block_cfgpred_block(get_nodes_block(src), j);
-               }
-               else
-                       user_blocks[i++] = is_Block(src) ? src : get_nodes_block(src);
-       }
-
-       assert(i == n && "get_irn_n_edges probably broken");
-
-       /* in case of only one user: return the block of the user */
-       if (n == 1)
-               return user_blocks[0];
-
-       i = 0;
-       /* search the smallest block dominating all user blocks */
-       do {
-               dom_bl  = node_smallest_common_dominator(user_blocks[i], user_blocks[i + 1]);
-               success = 1;
-
-               /* check if this block dominates all remaining blocks as well */
-               for (j = i + 2; j < n; j++) {
-                       if (! block_dominates(dom_bl, user_blocks[j]))
-                               success = 0;
-               }
-
-               if (success)
-                       break;
-
-               /* inherit the dominator block of the first (i + 1) users */
-               user_blocks[++i] = dom_bl;
-       } while (i < n - 1);
-
-       assert(success && "no block found dominating all users");
-
-       return dom_bl;
-}
-
-
 /* Get the first node in the list of nodes dominated by a given block. */
 ir_node *get_Block_dominated_first(const ir_node *bl)
 {
@@ -282,15 +230,12 @@ ir_node *get_Block_dominated_first(const ir_node *bl)
        return get_dom_info(bl)->first;
 }
 
-/* Get the next node in a list of nodes which are dominated by some
- * other node. */
 ir_node *get_Block_dominated_next(const ir_node *bl)
 {
        assert(is_Block(bl));
        return get_dom_info(bl)->next;
 }
 
-/* Check, if a block post dominates another block. */
 int block_postdominates(const ir_node *a, const ir_node *b)
 {
        const ir_dom_info *ai, *bi;
@@ -305,63 +250,62 @@ int block_postdominates(const ir_node *a, const ir_node *b)
        return 0;
 }
 
-/* Get the first node in the list of nodes post dominated by a given block. */
+int block_strictly_postdominates(const ir_node *a, const ir_node *b)
+{
+       return (a != b) && block_postdominates(a, b);
+}
+
 ir_node *get_Block_postdominated_first(const ir_node *bl)
 {
        assert(is_Block(bl));
        return get_pdom_info(bl)->first;
 }
 
-/* Get the next node in a list of nodes which are post dominated by some
- * other node. */
 ir_node *get_Block_postdominated_next(const ir_node *bl)
 {
        assert(is_Block(bl));
        return get_pdom_info(bl)->next;
 }
 
-/* Visit all nodes in the dominator subtree of a given node. */
 void dom_tree_walk(ir_node *bl, irg_walk_func *pre,
                irg_walk_func *post, void *env)
 {
        ir_node *p;
 
-       if(pre)
+       if (pre)
                pre(bl, env);
 
        dominates_for_each(bl, p) {
                dom_tree_walk(p, pre, post, env);
        }
 
-       if(post)
+       if (post)
                post(bl, env);
 }
 
-/* Visit all nodes in the post dominator subtree of a given node. */
 void postdom_tree_walk(ir_node *bl, irg_walk_func *pre,
                irg_walk_func *post, void *env)
 {
        ir_node *p;
 
-       if(pre)
+       if (pre)
                pre(bl, env);
 
        postdominates_for_each(bl, p) {
                postdom_tree_walk(p, pre, post, env);
        }
 
-       if(post)
+       if (post)
                post(bl, env);
 }
 
-/* Walk over the dominator tree of an irg starting at the root. */
 void dom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
                irg_walk_func *post, void *env)
 {
        /* The root of the dominator tree should be the Start block. */
        ir_node *root = get_irg_start_block(irg);
 
-  assert(irg->dom_state == dom_consistent
+       assert(irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE)
                        && "The dominators of the irg must be consistent");
        assert(root && "The start block of the graph is NULL?");
        assert(get_dom_info(root)->idom == NULL
@@ -369,14 +313,13 @@ void dom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
        dom_tree_walk(root, pre, post, env);
 }
 
-/* Walk over the post dominator tree of an irg starting at the root. */
 void postdom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
                irg_walk_func *post, void *env)
 {
-       /* The root of the dominator tree should be the End block. */
+       /* The root of the post dominator tree should be the End block. */
        ir_node *root = get_irg_end_block(irg);
 
-       assert(irg->pdom_state == dom_consistent
+       assert(irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_POSTDOMINANCE)
                        && "The dominators of the irg must be consistent");
        assert(root && "The end block of the graph is NULL?");
        assert(get_pdom_info(root)->idom == NULL
@@ -387,7 +330,7 @@ void postdom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
 
 static void assign_tree_dom_pre_order(ir_node *bl, void *data)
 {
-       unsigned *num = data;
+       unsigned *num = (unsigned*) data;
        ir_dom_info *bi = get_dom_info(bl);
 
        bi->tree_pre_num = (*num)++;
@@ -399,8 +342,9 @@ static void assign_tree_dom_pre_order_max(ir_node *bl, void *data)
        ir_node *p;
        unsigned max = 0;
        unsigned children = 0;
+       (void) data;
 
-       for(p = bi->first; p; p = get_dom_info(p)->next) {
+       for (p = bi->first; p; p = get_dom_info(p)->next) {
                unsigned max_p = get_dom_info(p)->max_subtree_pre_num;
                max = max > max_p ? max : max_p;
                children++;
@@ -412,7 +356,7 @@ static void assign_tree_dom_pre_order_max(ir_node *bl, void *data)
 
 static void assign_tree_postdom_pre_order(ir_node *bl, void *data)
 {
-       unsigned *num = data;
+       unsigned *num = (unsigned*) data;
        ir_dom_info *bi = get_pdom_info(bl);
 
        bi->tree_pre_num = (*num)++;
@@ -424,8 +368,9 @@ static void assign_tree_postdom_pre_order_max(ir_node *bl, void *data)
        ir_node *p;
        unsigned max = 0;
        unsigned children = 0;
+       (void) data;
 
-       for(p = bi->first; p; p = get_pdom_info(p)->next) {
+       for (p = bi->first; p; p = get_pdom_info(p)->next) {
                unsigned max_p = get_pdom_info(p)->max_subtree_pre_num;
                max = max > max_p ? max : max_p;
                children++;
@@ -435,15 +380,13 @@ static void assign_tree_postdom_pre_order_max(ir_node *bl, void *data)
        assert(bi->max_subtree_pre_num >= bi->tree_pre_num);
 }
 
-/*--------------------------------------------------------------------*/
-/*  Building and Removing the dominator data structure                */
-/*--------------------------------------------------------------------*/
-
 /**
  * count the number of blocks and clears the post dominance info
  */
-static void count_and_init_blocks_pdom(ir_node *bl, void *env) {
+static void count_and_init_blocks_pdom(ir_node *bl, void *env)
+{
        int *n_blocks = (int *) env;
+
        (*n_blocks) ++;
 
        memset(get_pdom_info(bl), 0, sizeof(ir_dom_info));
@@ -482,12 +425,12 @@ typedef struct {
  * Start block misses control dead blocks.
  */
 static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
-                              tmp_dom_info *tdi_list, int *used, int n_blocks) {
+                              tmp_dom_info *tdi_list, int *used, int n_blocks)
+{
        tmp_dom_info *tdi;
        int i;
 
-       assert(is_Block(bl));
-       if (get_irg_block_visited(current_ir_graph) == get_Block_block_visited(bl))
+       if (Block_block_visited(bl))
          return;
        mark_Block_block_visited(bl);
        set_Block_dom_pre_num(bl, *used);
@@ -506,7 +449,11 @@ static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
        /* Iterate */
        for (i = get_Block_n_cfg_outs_ka(bl) - 1; i >= 0; --i) {
                ir_node *pred = get_Block_cfg_out_ka(bl, i);
-               assert(is_Block(pred));
+               /* can happen for half-optimized dead code (I've seen this in student
+                  projects */
+               if (!is_Block(pred))
+                       continue;
+
                init_tmp_dom_info(pred, tdi, tdi_list, used, n_blocks);
        }
 }
@@ -516,11 +463,11 @@ static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
  * End block misses blocks in endless loops.
  */
 static void init_tmp_pdom_info(ir_node *bl, tmp_dom_info *parent,
-                               tmp_dom_info *tdi_list, int* used, int n_blocks) {
+                               tmp_dom_info *tdi_list, int* used, int n_blocks)
+{
        tmp_dom_info *tdi;
        int i;
 
-       assert(is_Block(bl));
        if (get_irg_block_visited(current_ir_graph) == get_Block_block_visited(bl))
          return;
        mark_Block_block_visited(bl);
@@ -542,7 +489,6 @@ static void init_tmp_pdom_info(ir_node *bl, tmp_dom_info *parent,
                ir_node *pred = get_Block_cfgpred_block(bl, i);
                if (is_Bad(pred))
                        continue;
-               assert(is_Block(pred));
                init_tmp_pdom_info(pred, tdi, tdi_list, used, n_blocks);
        }
 
@@ -563,7 +509,8 @@ static void init_tmp_pdom_info(ir_node *bl, tmp_dom_info *parent,
        }
 }
 
-static void dom_compress(tmp_dom_info *v) {
+static void dom_compress(tmp_dom_info *v)
+{
        assert (v->ancestor);
        if (v->ancestor->ancestor) {
                dom_compress (v->ancestor);
@@ -578,22 +525,26 @@ static void dom_compress(tmp_dom_info *v) {
  * if V is a root, return v, else return the vertex u, not being the
  * root, with minimum u->semi on the path from v to its root.
  */
-INLINE static tmp_dom_info *dom_eval(tmp_dom_info *v) {
+inline static tmp_dom_info *dom_eval(tmp_dom_info *v)
+{
        if (!v->ancestor) return v;
        dom_compress (v);
        return v->label;
 }
 
 /** make V W's ancestor */
-INLINE static void dom_link(tmp_dom_info *v, tmp_dom_info *w) {
+inline static void dom_link(tmp_dom_info *v, tmp_dom_info *w)
+{
        w->ancestor = v;
 }
 
 /**
  * Walker: count the number of blocks and clears the dominance info
  */
-static void count_and_init_blocks_dom(ir_node *bl, void *env) {
+static void count_and_init_blocks_dom(ir_node *bl, void *env)
+{
        int *n_blocks = (int *) env;
+
        (*n_blocks) ++;
 
        memset(get_dom_info(bl), 0, sizeof(ir_dom_info));
@@ -602,66 +553,8 @@ static void count_and_init_blocks_dom(ir_node *bl, void *env) {
        set_Block_dom_depth(bl, -1);
 }
 
-/**
- * Initialize the dominance/postdominance construction:
- *
- * - count the number of blocks
- * - clear the dominance info
- * - remove Block-keepalives of live blocks to reduce
- *   the number of "phantom" block edges
- *
- * @param irg  the graph
- * @param pre  a walker function that will be called for every block in the graph
- */
-static int init_construction(ir_graph *irg, irg_walk_func *pre) {
-       ir_graph *rem = current_ir_graph;
-       ir_node *end;
-       int arity;
-       int n_blocks = 0;
-
-       current_ir_graph = irg;
-
-       /* this visits only the reachable blocks */
-       irg_block_walk(get_irg_end_block(irg), pre, NULL, &n_blocks);
-
-       /* now visit the unreachable (from End) Blocks and remove unnecessary keep-alives */
-       end   = get_irg_end(irg);
-       arity = get_End_n_keepalives(end);
-       if (arity) {    /* we have keep-alives */
-               ir_node **in;
-               int i, j;
-
-               NEW_ARR_A(ir_node *, in, arity);
-               for (i = j = 0; i < arity; i++) {
-                       ir_node *pred = get_End_keepalive(end, i);
-
-                       if (get_irn_op(pred) == op_Block) {
-                               if (Block_not_block_visited(pred)) {
-                                       /* we found a endless loop */
-                                       dec_irg_block_visited(irg);
-                                       irg_block_walk(pred, pre, NULL, &n_blocks);
-                               }
-                               else
-                                       continue;
-                       }
-                       in[j++] = pred;
-               }
-               if (j != arity) {
-                       /* we kill some Block keep-alives */
-                       set_End_keepalives(end, j, in);
-                       set_irg_outs_inconsistent(irg);
-               }
-       }
-
-       current_ir_graph = rem;
-       return n_blocks;
-}
-
-
-/* Computes the dominator trees.  Sets a flag in irg to "dom_consistent".
-   If the control flow of the graph is changed this flag must be set to
-   "dom_inconsistent".  */
-void compute_doms(ir_graph *irg) {
+void compute_doms(ir_graph *irg)
+{
        ir_graph *rem = current_ir_graph;
        int n_blocks, used, i, j;
        tmp_dom_info *tdi_list;   /* Ein Golf? */
@@ -669,14 +562,14 @@ void compute_doms(ir_graph *irg) {
        current_ir_graph = irg;
 
        /* Update graph state */
-       assert(get_irg_phase_state(irg) != phase_building);
-       irg->dom_state = dom_consistent;
+       assert(!irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
 
        /* Count the number of blocks in the graph. */
-       n_blocks = init_construction(irg, count_and_init_blocks_dom);
+       n_blocks = 0;
+       irg_block_walk_graph(irg, count_and_init_blocks_dom, NULL, &n_blocks);
 
        /* Memory for temporary information. */
-       tdi_list = xcalloc(n_blocks, sizeof(tdi_list[0]));
+       tdi_list = XMALLOCNZ(tmp_dom_info, n_blocks);
 
        /* We need the out data structure. */
        assure_irg_outs(irg);
@@ -694,25 +587,28 @@ void compute_doms(ir_graph *irg) {
 
 
        for (i = n_blocks-1; i > 0; i--) {  /* Don't iterate the root, it's done. */
-               int irn_arity;
-               tmp_dom_info *w = &tdi_list[i];
+               tmp_dom_info *w     = &tdi_list[i];
+               ir_node      *block = w->block;
                tmp_dom_info *v;
+               int           irn_arity;
 
                /* Step 2 */
-               irn_arity = get_irn_arity(w->block);
+               irn_arity = get_irn_arity(block);
                for (j = 0; j < irn_arity;  j++) {
-                       ir_node *pred = get_Block_cfgpred_block(w->block, j);
+                       ir_node *pred       = get_Block_cfgpred(block, j);
+                       ir_node *pred_block = get_nodes_block(pred);
                        tmp_dom_info *u;
 
-                       if (is_Bad(pred) || (get_Block_dom_pre_num (pred) == -1))
-                               continue;       /* control-dead */
+                       if (is_Bad(pred) || (get_Block_dom_pre_num (pred_block) == -1))
+                               continue;    /* unreachable */
 
-                       u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
-                       if (u->semi < w->semi) w->semi = u->semi;
+                       u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred_block)]);
+                       if (u->semi < w->semi)
+                               w->semi = u->semi;
                }
 
                /* handle keep-alives if we are at the end block */
-               if (w->block == get_irg_end_block(irg)) {
+               if (block == get_irg_end_block(irg)) {
                        ir_node *end = get_irg_end(irg);
 
                        irn_arity = get_irn_arity(end);
@@ -720,11 +616,12 @@ void compute_doms(ir_graph *irg) {
                                ir_node *pred = get_irn_n(end, j);
                                tmp_dom_info *u;
 
-                               if (is_no_Block(pred) || get_Block_dom_pre_num(pred) == -1)
-                                       continue;       /* control-dead */
+                               if (!is_Block(pred) || get_Block_dom_pre_num(pred) == -1)
+                                       continue;   /* unreachable */
 
                                u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
-                               if (u->semi < w->semi) w->semi = u->semi;
+                               if (u->semi < w->semi)
+                                       w->semi = u->semi;
                        }
                }
 
@@ -761,7 +658,8 @@ void compute_doms(ir_graph *irg) {
                if (! w->dom)
                        continue; /* control dead */
 
-               if (w->dom != w->semi) w->dom = w->dom->dom;
+               if (w->dom != w->semi)
+                       w->dom = w->dom->dom;
                set_Block_idom(w->block, w->dom->block);
 
                /* blocks dominated by dead one's are still dead */
@@ -777,30 +675,32 @@ void compute_doms(ir_graph *irg) {
        /* Do a walk over the tree and assign the tree pre orders. */
        {
                unsigned tree_pre_order = 0;
-               dom_tree_walk_irg(irg, assign_tree_dom_pre_order,
-                       assign_tree_dom_pre_order_max, &tree_pre_order);
+               dom_tree_walk(get_irg_start_block(irg), assign_tree_dom_pre_order,
+                                 assign_tree_dom_pre_order_max, &tree_pre_order);
        }
        current_ir_graph = rem;
+       add_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE);
 }
 
-void assure_doms(ir_graph *irg) {
-       if (get_irg_dom_state(irg) != dom_consistent)
+void assure_doms(ir_graph *irg)
+{
+       if (! irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE))
                compute_doms(irg);
 }
 
-void free_dom(ir_graph *irg) {
+void free_dom(ir_graph *irg)
+{
        /* Update graph state */
-       assert(get_irg_phase_state(current_ir_graph) != phase_building);
-       current_ir_graph->dom_state = dom_none;
+       clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE);
 
-       /* With the implementation right now there is nothing to free,
-          but better call it anyways... */
+       /* With the implementation right now there is nothing to free */
+
+       /* free dominance frontiers */
+       ir_free_dominance_frontiers(irg);
 }
 
-/* Computes the post dominator trees.  Sets a flag in irg to "dom_consistent".
-   If the control flow of the graph is changed this flag must be set to
-   "dom_inconsistent".  */
-void compute_postdoms(ir_graph *irg) {
+void compute_postdoms(ir_graph *irg)
+{
        ir_graph *rem = current_ir_graph;
        int n_blocks, used, i, j;
        tmp_dom_info *tdi_list;
@@ -808,14 +708,14 @@ void compute_postdoms(ir_graph *irg) {
        current_ir_graph = irg;
 
        /* Update graph state */
-       assert(get_irg_phase_state(irg) != phase_building);
-       irg->pdom_state = dom_consistent;
+       assert(!irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
 
        /* Count the number of blocks in the graph. */
-       n_blocks = init_construction(irg, count_and_init_blocks_pdom);
+       n_blocks = 0;
+       irg_block_walk_graph(irg, count_and_init_blocks_pdom, NULL, &n_blocks);
 
        /* Memory for temporary information. */
-       tdi_list = xcalloc(n_blocks, sizeof(tdi_list[0]));
+       tdi_list = XMALLOCNZ(tmp_dom_info, n_blocks);
 
        /* We need the out data structure. */
        assure_irg_outs(irg);
@@ -843,7 +743,7 @@ void compute_postdoms(ir_graph *irg) {
                        tmp_dom_info *u;
 
                        if (get_Block_postdom_pre_num (succ) == -1)
-                               continue;       /* endless-loop */
+                               continue;    /* endless-loop */
 
                        u = dom_eval (&tdi_list[get_Block_postdom_pre_num(succ)]);
                        if (u->semi < w->semi) w->semi = u->semi;
@@ -888,22 +788,21 @@ void compute_postdoms(ir_graph *irg) {
        /* Do a walk over the tree and assign the tree pre orders. */
        {
                unsigned tree_pre_order = 0;
-               postdom_tree_walk_irg(irg, assign_tree_postdom_pre_order,
+               postdom_tree_walk(get_irg_end_block(irg), assign_tree_postdom_pre_order,
                        assign_tree_postdom_pre_order_max, &tree_pre_order);
        }
        current_ir_graph = rem;
+       add_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_POSTDOMINANCE);
 }
 
-void assure_postdoms(ir_graph *irg) {
-       if (get_irg_postdom_state(irg) != dom_consistent)
+void assure_postdoms(ir_graph *irg)
+{
+       if (! irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_POSTDOMINANCE))
                compute_postdoms(irg);
 }
 
-void free_postdom(ir_graph *irg) {
+void free_postdom(ir_graph *irg)
+{
        /* Update graph state */
-       assert(get_irg_phase_state(current_ir_graph) != phase_building);
-       current_ir_graph->pdom_state = dom_none;
-
-       /* With the implementation right now there is nothing to free,
-          but better call it anyways... */
+       clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_POSTDOMINANCE);
 }