assert(is_Block(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);
}
return get_dom_info(bl)->idom;
}
assert(is_Block(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);
}
return get_pdom_info(bl)->idom;
}
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)++;
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)++;
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));
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);
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;
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));
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". */
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);
tmp_dom_info *u;
if (is_Bad(pred) || (get_Block_dom_pre_num (pred) == -1))
- continue; /* control-dead */
+ continue; /* control-dead */
u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
if (u->semi < w->semi) w->semi = u->semi;
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; /* control-dead */
u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
if (u->semi < w->semi) w->semi = u->semi;
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);
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;