X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=baef5bf27bff05cb05b4cd2efa94a4e9c4fe2a02;hb=2af4a97900b435e35d7c20350604e3863aff2b4c;hp=3cebf32ef06a644f1907f7cc04daae9c69218944;hpb=901bb930a86871ff22dd4aa1c34424a3083ef5fa;p=libfirm

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index 3cebf32ef..baef5bf27 100644
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -22,7 +22,7 @@
  * @brief   Functions for traversing ir graphs
  * @author  Boris Boesler, Goetz Lindenmaier, Michael Beck
  * @version $Id$
- * @summary
+ * @brief
  *  traverse an ir graph
  *  - execute the pre function before recursion
  *  - execute the post function after recursion
@@ -119,7 +119,6 @@ static void irg_walk_cg(ir_node * node, ir_visited_t visited,
 
 	current_ir_graph = rem;
 }
-#endif
 
 /**
  * Insert all ir_graphs in irg_set, that are (transitive) reachable.
@@ -137,6 +136,7 @@ static void collect_irgs(ir_node * node, pset_new_t *irg_set) {
 		}
 	}
 }
+#endif
 
 /**
  * specialized version of irg_walk_2, called if only pre callback exists
@@ -231,8 +231,8 @@ irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * e
  *
  * @return number of visited nodes
  */
-static unsigned
-irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
+unsigned irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
+                    void *env)
 {
 	if (node->visited < current_ir_graph->visited) {
 		if      (!post) return irg_walk_2_pre (node, pre, env);
@@ -698,17 +698,13 @@ static void walk_entity(ir_entity *ent, void *env)
 {
 	walk_env *my_env = (walk_env *)env;
 
-	if (get_entity_variability(ent) != variability_uninitialized) {
-		if (ent->has_initializer) {
-			walk_initializer(ent->attr.initializer, my_env);
-		} else if (is_atomic_entity(ent)) {
-			irg_walk(get_atomic_ent_value(ent), my_env->pre, my_env->post, my_env->env);
-		} else {
-			int i, n_vals = get_compound_ent_n_values(ent);
+	if (ent->initializer != NULL) {
+		walk_initializer(ent->initializer, my_env);
+	} else if (entity_has_compound_ent_values(ent)) {
+		int i, n_vals = get_compound_ent_n_values(ent);
 
-			for (i = 0; i < n_vals; i++)
-				irg_walk(get_compound_ent_value(ent, i), my_env->pre, my_env->post, my_env->env);
-		}
+		for (i = 0; i < n_vals; i++)
+			irg_walk(get_compound_ent_value(ent, i), my_env->pre, my_env->post, my_env->env);
 	}
 }
 
@@ -716,6 +712,7 @@ static void walk_entity(ir_entity *ent, void *env)
 void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env) {
 	int i, j, n_types;
 	walk_env my_env;
+	ir_segment_t s;
 
 	ir_graph *rem = current_ir_graph;
 	current_ir_graph = get_const_code_irg();
@@ -726,8 +723,8 @@ void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env) {
 	my_env.env = env;
 
 	/* Walk all types that can contain constant entities.  */
-	for (i = 0; i < IR_SEGMENT_COUNT; i++)
-		walk_types_entities(get_segment_type((ir_segment_t) i), &walk_entity, &my_env);
+	for (s = IR_SEGMENT_FIRST; s <= IR_SEGMENT_LAST; s++)
+		walk_types_entities(get_segment_type(s), &walk_entity, &my_env);
 	n_types = get_irp_n_types();
 	for (i = 0; i < n_types; i++)
 		walk_types_entities(get_irp_type(i), &walk_entity, &my_env);