X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fana%2Firdom.c;h=c44f751b03f70cb74f9caa2317ed6923f07f1a22;hb=fabe62c2752d06a727637122ab5a0a5ccd83c422;hp=2726b484b9a4f17e1387add93080d8a90aad9906;hpb=6191bc0fe9dc62446b0e0c15e9179b13161dc63d;p=libfirm

diff --git a/ir/ana/irdom.c b/ir/ana/irdom.c
index 2726b484b..c44f751b0 100644
--- a/ir/ana/irdom.c
+++ b/ir/ana/irdom.c
@@ -468,6 +468,10 @@ static void assign_tree_postdom_pre_order_max(ir_node *bl, void *data)
 static void count_and_init_blocks_pdom(ir_node *bl, void *env)
 {
 	int *n_blocks = (int *) env;
+
+	if (is_Block_dead(bl))
+		return;
+
 	(*n_blocks) ++;
 
 	memset(get_pdom_info(bl), 0, sizeof(ir_dom_info));
@@ -511,8 +515,11 @@ static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
 	tmp_dom_info *tdi;
 	int i;
 
+	if (is_Block_dead(bl))
+		return;
+
 	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);
@@ -550,6 +557,9 @@ static void init_tmp_pdom_info(ir_node *bl, tmp_dom_info *parent,
 	tmp_dom_info *tdi;
 	int i;
 
+	if (is_Block_dead(bl))
+		return;
+
 	assert(is_Block(bl));
 	if (get_irg_block_visited(current_ir_graph) == get_Block_block_visited(bl))
 	  return;
@@ -628,6 +638,9 @@ inline static void dom_link(tmp_dom_info *v, tmp_dom_info *w)
 static void count_and_init_blocks_dom(ir_node *bl, void *env)
 {
 	int *n_blocks = (int *) env;
+	if (is_Block_dead(bl))
+		return;
+
 	(*n_blocks) ++;
 
 	memset(get_dom_info(bl), 0, sizeof(ir_dom_info));
@@ -636,63 +649,6 @@ 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 (!is_Block(pred)) {
-				pred = get_nodes_block(pred);
-				if (!is_Block(pred)) {
-					/* a node which has a bad block input: kill it */
-					continue;
-				}
-			}
-			dec_irg_block_visited(irg);
-			irg_block_walk(pred, pre, NULL, &n_blocks);
-			in[j++] = pred;
-		}
-		if (j != arity) {
-			/* we kill some 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".  */
@@ -709,7 +665,8 @@ void compute_doms(ir_graph *irg)
 	irg->dom_state = dom_consistent;
 
 	/* 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 = XMALLOCNZ(tmp_dom_info, n_blocks);
@@ -851,7 +808,8 @@ void compute_postdoms(ir_graph *irg)
 	irg->pdom_state = dom_consistent;
 
 	/* 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 = XMALLOCNZ(tmp_dom_info, n_blocks);