X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firbackedge.c;h=e8d780a851abc1ac6a1554cc6933e300d28402e1;hb=0f234e2d94155d13c0e4727871125beda0eaa66d;hp=d82f07eb1ac1c3c1cd0b771f0192ae4123682713;hpb=a999e1baedb84dc9b83059708699dac1c7fdb9a2;p=libfirm

diff --git a/ir/ana/irbackedge.c b/ir/ana/irbackedge.c
index d82f07eb1..e8d780a85 100644
--- a/ir/ana/irbackedge.c
+++ b/ir/ana/irbackedge.c
@@ -24,9 +24,7 @@
  * @date      7.2002
  * @version   $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "irnode_t.h"
 #include "irgraph_t.h"
@@ -59,8 +57,8 @@ static unsigned *mere_get_backarray(ir_node *n) {
 		}
 		break;
 	case iro_Phi:
-		assert(n->attr.phi_backedge && "backedge array not allocated!");
-		return n->attr.phi_backedge;
+		assert(n->attr.phi.u.backedge && "backedge array not allocated!");
+		return n->attr.phi.u.backedge;
 		break;
 	case iro_Filter:
 		if (get_interprocedural_view()) {
@@ -91,6 +89,7 @@ static unsigned *get_backarray(ir_node *n) {
 	return ba;
 }
 
+#ifndef NDEBUG
 /**
  * Returns non-zero if node has no backarray, or
  *                  if size of backarray == size of in array.
@@ -101,6 +100,7 @@ static int legal_backarray(ir_node *n) {
 		return 0;
 	return 1;
 }
+#endif
 
 void fix_backedges(struct obstack *obst, ir_node *n) {
 	unsigned *arr = mere_get_backarray(n);
@@ -116,7 +116,7 @@ void fix_backedges(struct obstack *obst, ir_node *n) {
 
 		opc = get_irn_opcode(n);
 		if (opc == iro_Phi)
-			n->attr.phi_backedge = arr;
+			n->attr.phi.u.backedge = arr;
 		else if (opc == iro_Block) {
 			if (!get_interprocedural_view())
 				n->attr.block.backedge = arr;
@@ -222,7 +222,7 @@ void new_backedge_info(ir_node *n) {
 		n->attr.block.backedge = new_backedge_arr(current_ir_graph->obst, get_irn_arity(n));
 		break;
 	case iro_Phi:
-		n->attr.phi_backedge = new_backedge_arr(current_ir_graph->obst, get_irn_arity(n));
+		n->attr.phi.u.backedge = new_backedge_arr(current_ir_graph->obst, get_irn_arity(n));
 		break;
 	case iro_Filter:
 		n->attr.filter.backedge = new_backedge_arr(current_ir_graph->obst, get_irn_arity(n));