X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeuses.c;h=9b77c4797a1f06a4994dc8f36cf4513d253e55a9;hb=fef8dc3eff6468d7d65485af8e1ac9884c504e1a;hp=87be078339673f79b5a6665eb7d6a308cdbc342a;hpb=7cf06579801b69086b3b8ee2aee61b4a5606b660;p=libfirm

diff --git a/ir/be/beuses.c b/ir/be/beuses.c
index 87be07833..9b77c4797 100644
--- a/ir/be/beuses.c
+++ b/ir/be/beuses.c
@@ -104,7 +104,7 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env,
 
 	temp.block = block;
 	temp.node = def;
-	result = (be_use_t*)set_find(env->uses, &temp, sizeof(temp), hash);
+	result = set_find(be_use_t, env->uses, &temp, sizeof(temp), hash);
 
 	if (result == NULL) {
 		// insert templ first as we might end in a loop in the get_next_use
@@ -112,7 +112,7 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env,
 		temp.next_use = USES_INFINITY;
 		temp.outermost_loop = UNKNOWN_OUTERMOST_LOOP;
 		temp.visited = 0;
-		result = (be_use_t*)set_insert(env->uses, &temp, sizeof(temp), hash);
+		result = set_insert(be_use_t, env->uses, &temp, sizeof(temp), hash);
 	}
 
 	if (result->outermost_loop == UNKNOWN_OUTERMOST_LOOP && result->visited < env->visited_counter) {
@@ -143,10 +143,6 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env,
  */
 static int be_is_phi_argument(const ir_node *block, const ir_node *def)
 {
-	ir_node *node;
-	ir_node *succ_block = NULL;
-	int arity, i;
-
 #if 1
 	if (get_irn_n_edges_kind(block, EDGE_KIND_BLOCK) < 1)
 #else
@@ -154,20 +150,16 @@ static int be_is_phi_argument(const ir_node *block, const ir_node *def)
 #endif
 		return 0;
 
-	succ_block = get_first_block_succ(block);
+	ir_node *const succ_block = get_first_block_succ(block);
 
-	arity = get_Block_n_cfgpreds(succ_block);
-	if (arity <= 1) {
+	if (get_Block_n_cfgpreds(succ_block) <= 1) {
 		/* no Phis in the successor */
 		return 0;
 	}
 
 	/* find the index of block in its successor */
-	for (i = 0; i < arity; ++i) {
-		if (get_Block_cfgpred_block(succ_block, i) == block)
-			break;
-	}
-	assert(i < arity);
+	int const i = get_Block_cfgpred_pos(succ_block, block);
+	assert(i >= 0);
 
 	/* iterate over the Phi nodes in the successor and check if def is
 	 * one of its arguments */
@@ -227,7 +219,6 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
 	ir_node  *node;
 	unsigned  timestep;
 	unsigned  next_use_step;
-	const ir_edge_t *edge;
 
 	assert(skip_from_uses == 0 || skip_from_uses == 1);
 	if (skip_from_uses) {
@@ -369,7 +360,6 @@ be_next_use_t be_get_next_use(be_uses_t *env, ir_node *from,
  */
 static void set_sched_step_walker(ir_node *block, void *data)
 {
-	ir_node  *node;
 	unsigned step = 0;
 	(void) data;