projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename type entity into ir_entity
[libfirm]
/
ir
/
ana
/
irdom.c
diff --git
a/ir/ana/irdom.c
b/ir/ana/irdom.c
index
01cd4a2
..
cf47222
100644
(file)
--- a/
ir/ana/irdom.c
+++ b/
ir/ana/irdom.c
@@
-182,7
+182,8
@@
int block_dominates(const ir_node *a, const ir_node *b)
}
/* Returns the smallest common dominator block of two nodes. */
}
/* 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;
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;
@@
-209,7
+210,8
@@
ir_node *node_smallest_common_dominator(ir_node *a, ir_node *b) {
}
/* Returns the smallest common dominator block of all users of a node. */
}
/* 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;
int n, j, i = 0, success;
ir_node **user_blocks, *dom_bl;
const ir_edge_t *edge;
@@
-226,7
+228,7
@@
ir_node *node_users_smallest_common_dominator(ir_node *irn, int handle_phi) {
if (is_Phi(src) && handle_phi) {
/* get the corresponding cfg predecessor block if phi handling requested */
if (is_Phi(src) && handle_phi) {
/* get the corresponding cfg predecessor block if phi handling requested */
- j = get_
irn_pred_pos(src, irn
);
+ j = get_
edge_src_pos(edge
);
assert(j >= 0 && "kaputt");
user_blocks[i++] = get_Block_cfgpred_block(get_nodes_block(src), j);
}
assert(j >= 0 && "kaputt");
user_blocks[i++] = get_Block_cfgpred_block(get_nodes_block(src), j);
}
@@
-234,6
+236,8
@@
ir_node *node_users_smallest_common_dominator(ir_node *irn, int handle_phi) {
user_blocks[i++] = is_Block(src) ? src : get_nodes_block(src);
}
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];
/* in case of only one user: return the block of the user */
if (n == 1)
return user_blocks[0];
@@
-470,7
+474,7
@@
typedef struct {
* Start block misses control dead blocks.
*/
static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
* 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;
tmp_dom_info *tdi;
int i;
@@
-480,21
+484,22
@@
static void init_tmp_dom_info(ir_node *bl, tmp_dom_info *parent,
mark_Block_block_visited(bl);
set_Block_dom_pre_num(bl, *used);
mark_Block_block_visited(bl);
set_Block_dom_pre_num(bl, *used);
+ assert(*used < n_blocks);
tdi = &tdi_list[*used];
++(*used);
tdi = &tdi_list[*used];
++(*used);
- tdi->semi = tdi;
- tdi->label = tdi;
+ tdi->semi
= tdi;
+ tdi->label
= tdi;
tdi->ancestor = NULL;
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));
/* 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
);
}
}
}
}
@@
-503,7
+508,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,
* 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;
tmp_dom_info *tdi;
int i;
@@
-513,6
+518,7
@@
static void init_tmp_pdom_info(ir_node *bl, tmp_dom_info *parent,
mark_Block_block_visited(bl);
set_Block_postdom_pre_num(bl, *used);
mark_Block_block_visited(bl);
set_Block_postdom_pre_num(bl, *used);
+ assert(*used < n_blocks);
tdi = &tdi_list[*used];
++(*used);
tdi = &tdi_list[*used];
++(*used);
@@
-529,7
+535,7
@@
static void init_tmp_pdom_info(ir_node *bl, tmp_dom_info *parent,
if (is_Bad(pred))
continue;
assert(is_Block(pred));
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
}
/* Handle keep-alives. Note that the preprocessing
@@
-544,7
+550,7
@@
static void init_tmp_pdom_info(ir_node *bl, tmp_dom_info *parent,
ir_node *pred = get_irn_n(end, i);
if (is_Block(pred))
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
);
}
}
}
}
}
}
@@
-674,10
+680,11
@@
void compute_doms(ir_graph *irg) {
simple. */
used = 0;
inc_irg_block_visited(irg);
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"); */
/* 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;
n_blocks = used;
@@
-708,10
+715,7
@@
void compute_doms(ir_graph *irg) {
ir_node *pred = get_irn_n(end, j);
tmp_dom_info *u;
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)]);
continue; /* control-dead */
u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
@@
-747,15
+751,23
@@
void compute_doms(ir_graph *irg) {
set_Block_dom_depth(tdi_list[0].block, 1);
for (i = 1; i < n_blocks; i++) {
tmp_dom_info *w = &tdi_list[i];
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);
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);
}
/* clean up */
free(tdi_list);
- current_ir_graph = rem;
/* Do a walk over the tree and assign the tree pre orders. */
{
/* Do a walk over the tree and assign the tree pre orders. */
{
@@
-763,6
+775,7
@@
void compute_doms(ir_graph *irg) {
dom_tree_walk_irg(irg, assign_tree_dom_pre_order,
assign_tree_dom_pre_order_max, &tree_pre_order);
}
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) {
}
void assure_doms(ir_graph *irg) {
@@
-806,7
+819,7
@@
void compute_postdoms(ir_graph *irg) {
simple. */
used = 0;
inc_irg_block_visited(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"); */
/* If not all blocks are reachable from End by cfg edges this assertion
fails.
assert(used == n_blocks && "Precondition for dom construction violated"); */
@@
-866,7
+879,6
@@
void compute_postdoms(ir_graph *irg) {
/* clean up */
free(tdi_list);
/* clean up */
free(tdi_list);
- irg = rem;
/* Do a walk over the tree and assign the tree pre orders. */
{
/* Do a walk over the tree and assign the tree pre orders. */
{
@@
-874,6
+886,7
@@
void compute_postdoms(ir_graph *irg) {
postdom_tree_walk_irg(irg, assign_tree_postdom_pre_order,
assign_tree_postdom_pre_order_max, &tree_pre_order);
}
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) {
}
void assure_postdoms(ir_graph *irg) {