optimize_graph_df():

[libfirm] / ir / ana / irdom.c

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index 3ccbfbf..020c292 100644 (file)
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -281,7 +281,7 @@ void postdom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
        /* The root of the dominator tree should be the End block. */
        ir_node *root = get_irg_end_block(irg);
 
-  assert(irg->pdom_state == dom_consistent
+       assert(irg->pdom_state == dom_consistent
                        && "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
@@ -348,13 +348,13 @@ static void assign_tree_postdom_pre_order_max(ir_node *bl, void *data)
  * count the number of blocks and clears the post dominance info
  */
 static void count_and_init_blocks_pdom(ir_node *bl, void *env) {
-  int *n_blocks = (int *) env;
-  (*n_blocks) ++;
+       int *n_blocks = (int *) env;
+       (*n_blocks) ++;
 
        memset(get_pdom_info(bl), 0, sizeof(dom_info));
-  set_Block_ipostdom(bl, NULL);
-  set_Block_postdom_pre_num(bl, -1);
-  set_Block_postdom_depth(bl, -1);
+       set_Block_ipostdom(bl, NULL);
+       set_Block_postdom_pre_num(bl, -1);
+       set_Block_postdom_depth(bl, -1);
 }
 
 /** temporary type used while constructing the dominator / post dominator tree. */
@@ -387,7 +387,7 @@ 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) {
+                              tmp_dom_info *tdi_list, int *used) {
   tmp_dom_info *tdi;
   int i;
 
@@ -420,7 +420,7 @@ 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) {
+                               tmp_dom_info *tdi_list, int* used) {
   tmp_dom_info *tdi;
   int i;
 
@@ -513,7 +513,7 @@ static void count_and_init_blocks_dom(ir_node *bl, void *env) {
  *
  * - count the number of blocks
  * - clear the dominance info
- * - remove block-keepalives of live blocks to reduce
+ * - remove Block-keepalives of live blocks to reduce
  *   the number of "phantom" block edges
  *
  * @param irg  the graph
@@ -532,14 +532,14 @@ static int init_construction(ir_graph *irg, irg_walk_func *pre) {
 
   /* now visit the unreachable (from End) Blocks and remove unnecessary keep-alives */
   end   = get_irg_end(irg);
-  arity = get_irn_arity(end);
+  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_irn_n(end, i);
+      ir_node *pred = get_End_keepalive(end, i);
 
       if (get_irn_op(pred) == op_Block) {
         if (Block_not_block_visited(pred)) {
@@ -554,7 +554,7 @@ static int init_construction(ir_graph *irg, irg_walk_func *pre) {
     }
     if (j != arity) {
       /* we kill some Block keep-alives */
-      set_irn_in(end, j, in);
+      set_End_keepalives(end, j, in);
       set_irg_outs_inconsistent(irg);
     }
   }
@@ -585,8 +585,7 @@ void compute_doms(ir_graph *irg) {
   tdi_list = xcalloc(n_blocks, sizeof(tdi_list[0]));
 
   /* We need the out data structure. */
-  if (irg->outs_state != outs_consistent)
-    compute_irg_outs(irg);
+  assure_irg_outs(irg);
 
   /* this with a standard walker as passing the parent to the sons isn't
      simple. */
@@ -683,6 +682,11 @@ void compute_doms(ir_graph *irg) {
   }
 }
 
+void assure_doms(ir_graph *irg) {
+  if (get_irg_dom_state(irg) != dom_consistent)
+    compute_doms(irg);
+}
+
 void free_dom(ir_graph *irg) {
   /* Update graph state */
   assert(get_irg_phase_state(current_ir_graph) != phase_building);
@@ -713,8 +717,7 @@ void compute_postdoms(ir_graph *irg) {
   tdi_list = xcalloc(n_blocks, sizeof(tdi_list[0]));
 
   /* We need the out data structure. */
-  if (irg->outs_state != outs_consistent)
-    compute_irg_outs(irg);
+  assure_irg_outs(irg);
 
   /* this with a standard walker as passing the parent to the sons isn't
      simple. */
@@ -790,6 +793,11 @@ void compute_postdoms(ir_graph *irg) {
   }
 }
 
+void assure_postdoms(ir_graph *irg) {
+  if (get_irg_postdom_state(irg) != dom_consistent)
+    compute_postdoms(irg);
+}
+
 void free_postdom(ir_graph *irg) {
   /* Update graph state */
   assert(get_irg_phase_state(current_ir_graph) != phase_building);