X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firouts.c;h=92a57553aef83b3308039a35af2f0eb384aaf944;hb=ba11728a9b4dbb5029f025d7ddf4659768dec02d;hp=32e3cac7ca5c47a75e0d48b75ce70a6f72fdf49f;hpb=b218ad7c9031a72680a1d4b1f3613f6e242bbe0a;p=libfirm

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index 32e3cac7c..92a57553a 100644
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -244,18 +244,18 @@ void irg_out_block_walk(ir_node *node,
 
 	inc_irg_block_visited(current_ir_graph);
 
-  if (get_irn_mode(node) == mode_X) {
-    int i, n;
-
-	  for (i = 0, n = get_irn_n_outs(node); i < n; ++i) {
-		  ir_node *succ = get_irn_out(node, i);
-		  if (get_irn_visited(succ) < get_irg_visited(current_ir_graph))
-			  irg_out_walk_2(succ, pre, post, env);
-	  }
-  }
-  else {
-	  irg_out_block_walk2(node, pre, post, env);
-  }
+	if (get_irn_mode(node) == mode_X) {
+		int i, n;
+
+		for (i = 0, n = get_irn_n_outs(node); i < n; ++i) {
+			ir_node *succ = get_irn_out(node, i);
+			if (get_irn_visited(succ) < get_irg_visited(current_ir_graph))
+				irg_out_walk_2(succ, pre, post, env);
+		}
+	}
+	else {
+		irg_out_block_walk2(node, pre, post, env);
+	}
 }
 
 /*--------------------------------------------------------------------*/
@@ -315,15 +315,22 @@ static int count_outs(ir_graph *irg) {
 	inc_irg_visited(irg);
 	res = _count_outs(get_irg_end(irg));
 
-	/* now handle special nodes */
+	/* Now handle special nodes. We need the out count of those
+	   even if they are not visible. */
 	n = get_irg_frame(irg);
-	if (irn_not_visited(n)) {
+	if (! is_Bad(n) && irn_not_visited(n)) {
 		n->out = (ir_node **)1;
 		++res;
 	}
 
 	n = get_irg_args(irg);
-	if (irn_not_visited(n)) {
+	if (! is_Bad(n) && irn_not_visited(n)) {
+		n->out = (ir_node **)1;
+		++res;
+	}
+
+	n = get_irg_value_param_base(irg);
+	if (! is_Bad(n) && irn_not_visited(n)) {
 		n->out = (ir_node **)1;
 		++res;
 	}
@@ -381,7 +388,7 @@ static ir_node **_set_out_edges(ir_node *n, ir_node **free) {
  * @return The next free address
  */
 static ir_node **set_out_edges(ir_graph *irg, ir_node **free) {
-	ir_node *n, *special[2];
+	ir_node *n, *special[3];
 	int i, n_outs;
 
 	inc_irg_visited(irg);
@@ -390,9 +397,12 @@ static ir_node **set_out_edges(ir_graph *irg, ir_node **free) {
 	/* handle special nodes */
 	special[0] = get_irg_frame(irg);
 	special[1] = get_irg_args(irg);
+	special[2] = get_irg_value_param_base(irg);
 
-	for (i = 1; i >= 0; --i) {
+	for (i = 2; i >= 0; --i) {
 		n = special[i];
+		if (is_Bad(n))
+			continue;
 
 		if (get_irn_visited(n) < get_irg_visited(current_ir_graph)) {
 			n_outs = PTR_TO_INT(n->out);
@@ -500,6 +510,7 @@ void free_irp_outs(void) {
  *------------------------------------------------------------*/
 
 
+#ifdef INTERPROCEDURAL_VIEW
 /**
  * Inits the number of outedges for each node
  * before counting.
@@ -531,7 +542,6 @@ static void node_arity_count(ir_node * node, void * env) {
 	}
 }
 
-
 /*
  * Inits all nodes for setting the outedges
  * Returns the overall count of edges
@@ -626,6 +636,7 @@ void free_ip_outs(void) {
 	}
 	irp->outs_state = outs_none;
 }
+#endif
 
 
 void free_irg_outs(ir_graph *irg) {