X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fheights.c;h=5c4ac030c8c80eb48856776c4c1c8174f6163f1b;hb=a6888dd0c74a74aa5ec89d4542e402bda7cd61cb;hp=c50ec9ff3ee097f586880f981597e613fb780b98;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm

diff --git a/ir/ana/heights.c b/ir/ana/heights.c
index c50ec9ff3..5c4ac030c 100644
--- a/ir/ana/heights.c
+++ b/ir/ana/heights.c
@@ -53,13 +53,13 @@ typedef struct {
 static irn_height_t *maybe_get_height_data(const ir_heights_t *heights,
                                            const ir_node *node)
 {
-	irn_height_t *height = (irn_height_t*)ir_nodemap_get(&heights->data, node);
+	irn_height_t *height = ir_nodemap_get(irn_height_t, &heights->data, node);
 	return height;
 }
 
 static irn_height_t *get_height_data(ir_heights_t *heights, const ir_node *node)
 {
-	irn_height_t *height = (irn_height_t*)ir_nodemap_get(&heights->data, node);
+	irn_height_t *height = ir_nodemap_get(irn_height_t, &heights->data, node);
 	if (height == NULL) {
 		height = OALLOCZ(&heights->obst, irn_height_t);
 		ir_nodemap_insert(&heights->data, node, height);
@@ -121,10 +121,6 @@ static bool search(ir_heights_t *h, const ir_node *curr, const ir_node *tgt)
 	return false;
 }
 
-/**
- * Check, if one node can be reached from another one, according to data
- * dependence.
- */
 int heights_reachable_in_block(ir_heights_t *h, const ir_node *n,
                                const ir_node *m)
 {
@@ -230,7 +226,7 @@ unsigned heights_recompute_block(ir_heights_t *h, ir_node *block)
 	ir_graph *irg = get_irn_irg(block);
 	const ir_edge_t *edge;
 
-	edges_assure(irg);
+	assure_edges(irg);
 
 	/* reset phase data for all nodes in the block */
 	foreach_out_edge(block, edge) {
@@ -250,7 +246,7 @@ ir_heights_t *heights_new(ir_graph *irg)
 	obstack_init(&res->obst);
 	res->dump_handle = dump_add_node_info_callback(height_dump_cb, res);
 
-	edges_assure(irg);
+	assure_edges(irg);
 	irg_block_walk_graph(irg, compute_heights_in_block_walker, NULL, res);
 
 	return res;