X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=cb6795d35f4fef007b8eb3ed3a8f87c8afd2e452;hb=b597c7fd473086ca6374b2abbdf129f595c156d0;hp=b1d37e8d9d6f9e9f01dee7ff99d755a9248b8065;hpb=e6d6d877b442783037ee95b8b4e7054031b551af;p=libfirm

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index b1d37e8d9..cb6795d35 100644
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -275,14 +275,13 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 		pset_new_destroy(&irg_set);
 	} else {
 #endif
-		set_using_irn_visited(current_ir_graph);
+		ir_reserve_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
 		inc_irg_visited(current_ir_graph);
 		nodes_touched = irg_walk_2(node, pre, post, env);
-		clear_using_irn_visited(current_ir_graph);
+		ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
 #ifdef INTERPROCEDURAL_VIEW
 	}
 #endif
-	return;
 }
 
 /*
@@ -427,12 +426,11 @@ void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
 	if (get_interprocedural_view()) {
 		assert(0 && "This is not yet implemented.");
 	} else {
-		set_using_irn_visited(current_ir_graph);
+		ir_reserve_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
 		inc_irg_visited(current_ir_graph);
 		nodes_touched = irg_walk_in_or_dep_2(node, pre, post, env);
-		clear_using_irn_visited(current_ir_graph);
+		ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
 	}
-	return;
 }
 
 /*
@@ -496,7 +494,6 @@ cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 
 		if (post) post(node, env);
 	}
-	return;
 }
 
 #ifdef INTERPROCEDURAL_VIEW
@@ -565,15 +562,12 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
 
 /* Walks back from n until it finds a real cf op. */
 static ir_node *get_cf_op(ir_node *n) {
-	ir_node *pred;
-
-	n = skip_Id(n);
-	n = skip_Tuple(n);
-	pred = skip_Proj(n);
-	if (!(is_cfop(pred) || is_fragile_op(pred) || is_Bad(pred)))
-		n = get_cf_op(n);
-
-	return skip_Proj(n);
+	while (!is_cfop(n) && !is_fragile_op(n) && !is_Bad(n)) {
+		n = skip_Id(n);
+		n = skip_Tuple(n);
+		n = skip_Proj(n);
+	}
+	return n;
 }
 
 static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
@@ -607,16 +601,17 @@ static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *p
    flag, so that it can be interleaved with the other walker.         */
 void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
+	ir_graph *irg = current_ir_graph;
 	ir_node *block, *pred;
 	int i;
 
-	hook_irg_block_walk(current_ir_graph, node, (generic_func *)pre, (generic_func *)post);
+	hook_irg_block_walk(irg, node, (generic_func *)pre, (generic_func *)post);
 
 	assert(node);
 	assert(!get_interprocedural_view());   /* interprocedural_view not implemented, because it
 					       * interleaves with irg_walk */
-	set_using_block_visited(current_ir_graph);
-	inc_irg_block_visited(current_ir_graph);
+	ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED);
+	inc_irg_block_visited(irg);
 	block = is_Block(node) ? node : get_nodes_block(node);
 	assert(get_irn_op(block) == op_Block);
 	irg_block_walk_2(block, pre, post, env);
@@ -642,7 +637,7 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
 		}
 	}
 
-	clear_using_block_visited(current_ir_graph);
+	ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED);
 }
 
 /*