/* 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
* 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. */
* 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;
* 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;
assert(is_Block(pred));
init_tmp_pdom_info(pred, tdi, tdi_list, used);
}
+
+ /* Handle keep-alives. Note that the preprocessing
+ in init_construction() had already killed all
+ phantom keep-alive edges. All remaining block keep-alives
+ are really edges to endless loops.
+ */
+ if (bl == get_irg_end_block(current_ir_graph)) {
+ ir_node *end = get_irg_end(current_ir_graph);
+
+ for (i = get_irn_arity(end) - 1; i >= 0; --i) {
+ ir_node *pred = get_irn_n(end, i);
+
+ if (is_Block(pred))
+ init_tmp_pdom_info(pred, tdi, tdi_list, used);
+ }
+ }
}
static void dom_compress(tmp_dom_info *v)
*
* - 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
/* 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)) {
}
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);
}
}
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. */
}
}
+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);
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. */
tmp_dom_info *v;
/* Step 2 */
- irn_arity = get_Block_n_cfg_outs(w->block);
+ irn_arity = get_Block_n_cfg_outs_ka(w->block);
for (j = 0; j < irn_arity; j++) {
- ir_node *succ = get_Block_cfg_out(w->block, j);
+ ir_node *succ = get_Block_cfg_out_ka(w->block, j);
tmp_dom_info *u;
if (get_Block_postdom_pre_num (succ) == -1)
}
}
+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);