}
/* Returns the smallest common dominator block of two nodes. */
-ir_node *node_smallest_common_dominator(ir_node *a, ir_node *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);
ir_node *bl_b = is_Block(b) ? b : get_nodes_block(b);
ir_node *dom_bl = NULL;
}
/* 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) {
+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;
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];
* 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, int n_blocks) {
tmp_dom_info *tdi;
int i;
mark_Block_block_visited(bl);
set_Block_dom_pre_num(bl, *used);
+ assert(*used < n_blocks);
tdi = &tdi_list[*used];
++(*used);
- tdi->semi = tdi;
- tdi->label = tdi;
+ tdi->semi = tdi;
+ tdi->label = tdi;
tdi->ancestor = NULL;
- tdi->bucket = NULL;
- tdi->parent = parent;
- tdi->block = bl;
+ tdi->bucket = NULL;
+ tdi->parent = parent;
+ tdi->block = bl;
/* 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));
- init_tmp_dom_info(pred, tdi, tdi_list, used);
+ init_tmp_dom_info(pred, tdi, tdi_list, used, n_blocks);
}
}
* 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, int n_blocks) {
tmp_dom_info *tdi;
int i;
mark_Block_block_visited(bl);
set_Block_postdom_pre_num(bl, *used);
+ assert(*used < n_blocks);
tdi = &tdi_list[*used];
++(*used);
if (is_Bad(pred))
continue;
assert(is_Block(pred));
- init_tmp_pdom_info(pred, tdi, tdi_list, used);
+ init_tmp_pdom_info(pred, tdi, tdi_list, used, n_blocks);
}
/* Handle keep-alives. Note that the preprocessing
ir_node *pred = get_irn_n(end, i);
if (is_Block(pred))
- init_tmp_pdom_info(pred, tdi, tdi_list, used);
+ init_tmp_pdom_info(pred, tdi, tdi_list, used, n_blocks);
}
}
}
simple. */
used = 0;
inc_irg_block_visited(irg);
- init_tmp_dom_info(get_irg_start_block(irg), NULL, tdi_list, &used);
+ init_tmp_dom_info(get_irg_start_block(irg), NULL, tdi_list, &used, n_blocks);
/* If not all blocks are reachable from Start by out edges this assertion
fails.
assert(used == n_blocks && "Precondition for dom construction violated"); */
+ assert(used <= n_blocks && "Precondition for dom construction violated");
n_blocks = used;
ir_node *pred = get_irn_n(end, j);
tmp_dom_info *u;
- if (is_no_Block(pred))
- continue;
-
- if (get_Block_dom_pre_num(pred) == -1)
+ if (is_no_Block(pred) || get_Block_dom_pre_num(pred) == -1)
continue; /* control-dead */
u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
set_Block_dom_depth(tdi_list[0].block, 1);
for (i = 1; i < n_blocks; i++) {
tmp_dom_info *w = &tdi_list[i];
+ int depth;
+
+ if (! w->dom)
+ continue; /* control dead */
if (w->dom != w->semi) w->dom = w->dom->dom;
set_Block_idom(w->block, w->dom->block);
- set_Block_dom_depth(w->block, get_Block_dom_depth(w->dom->block) + 1);
+
+ /* blocks dominated by dead one's are still dead */
+ depth = get_Block_dom_depth(w->dom->block);
+ if (depth > 0)
+ ++depth;
+ set_Block_dom_depth(w->block, depth);
}
/* clean up */
free(tdi_list);
- current_ir_graph = rem;
/* Do a walk over the tree and assign the tree pre orders. */
{
dom_tree_walk_irg(irg, assign_tree_dom_pre_order,
assign_tree_dom_pre_order_max, &tree_pre_order);
}
+ current_ir_graph = rem;
}
void assure_doms(ir_graph *irg) {
simple. */
used = 0;
inc_irg_block_visited(irg);
- init_tmp_pdom_info(get_irg_end_block(irg), NULL, tdi_list, &used);
+ init_tmp_pdom_info(get_irg_end_block(irg), NULL, tdi_list, &used, n_blocks);
/* If not all blocks are reachable from End by cfg edges this assertion
fails.
assert(used == n_blocks && "Precondition for dom construction violated"); */
/* clean up */
free(tdi_list);
- irg = rem;
/* Do a walk over the tree and assign the tree pre orders. */
{
postdom_tree_walk_irg(irg, assign_tree_postdom_pre_order,
assign_tree_postdom_pre_order_max, &tree_pre_order);
}
+ current_ir_graph = rem;
}
void assure_postdoms(ir_graph *irg) {