X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fgvn_pre.c;h=e8123abfb380b1b744dbac964aae0d876a6e3ac4;hb=7af9389c7b0901e561e4bc1dee02f46876152893;hp=58f7efa036eb76b71a8ea614502ea8130c0e50a3;hpb=ca21c59ea00ff05918de26952e91ac39f1589e01;p=libfirm

diff --git a/ir/opt/gvn_pre.c b/ir/opt/gvn_pre.c
index 58f7efa03..e8123abfb 100644
--- a/ir/opt/gvn_pre.c
+++ b/ir/opt/gvn_pre.c
@@ -27,6 +27,7 @@
  */
 #include "config.h"
 
+#include "iroptimize.h"
 #include "irflag.h"
 #include "irdom.h"
 #include "irouts.h"
@@ -372,11 +373,11 @@ static ir_node *phi_translate(ir_node *node, ir_node *block, int pos, ir_valuese
 		return node;
 	}
 
-	arity = get_irn_intra_arity(node);
+	arity = get_irn_arity(node);
 
 	/* check if the node has at least one Phi predecessor */
 	for (i = 0; i < arity; ++i) {
-		ir_node *pred    = get_irn_intra_n(node, i);
+		ir_node *pred    = get_irn_n(node, i);
 		ir_node *leader  = lookup(pred);
 		ir_node *trans;
 
@@ -401,11 +402,11 @@ static ir_node *phi_translate(ir_node *node, ir_node *block, int pos, ir_valuese
 		get_irn_in(node));
 	/* We need the attribute copy here, because the Hash value of a
 	   node might depend on that. */
-	copy_node_attr(node, nn);
+	copy_node_attr(current_ir_graph, node, nn);
 
 	set_nodes_block(nn, get_nodes_block(node));
 	for (i = 0; i < arity; ++i) {
-		ir_node *pred    = get_irn_intra_n(node, i);
+		ir_node *pred    = get_irn_n(node, i);
 		ir_node *leader  = lookup(pred);
 		ir_node *trans;
 
@@ -540,7 +541,7 @@ static void insert_nodes(ir_node *block, void *ctx)
 	pre_env    *env = ctx;
 	ir_node    *value, *expr, *idom, *first_s, *worklist;
 	block_info *curr_info, *idom_info;
-	int        pos, arity = get_irn_intra_arity(block);
+	int        pos, arity = get_irn_arity(block);
 	int        all_same, by_some, updated;
 	ir_valueset_iterator_t iter;
 
@@ -660,7 +661,7 @@ static void insert_nodes(ir_node *block, void *ctx)
 								mode,
 								get_irn_arity(pred),
 								get_irn_in(pred) + 1);
-							copy_node_attr(pred, nn);
+							copy_node_attr(current_ir_graph, pred, nn);
 
 							DB((dbg, LEVEL_1, "New node %+F in block %+F created\n", nn, pred_blk));
 							proj_pred = nn;
@@ -673,7 +674,7 @@ static void insert_nodes(ir_node *block, void *ctx)
 							mode,
 							get_irn_arity(e_prime),
 							get_irn_in(e_prime) + 1);
-						copy_node_attr(e_prime, nn);
+						copy_node_attr(current_ir_graph, e_prime, nn);
 						if (proj_pred != NULL) {
 							set_Proj_pred(nn, proj_pred);
 						}
@@ -718,7 +719,7 @@ static void eliminate(ir_node *irn, void *ctx)
 {
 	pre_env *env = ctx;
 
-	if (is_no_Block(irn)) {
+	if (!is_Block(irn)) {
 		ir_node *block = get_nodes_block(irn);
 		block_info *bl = get_block_info(block);
 		ir_node *value = lookup(irn);
@@ -762,7 +763,7 @@ static void eliminate_nodes(elim_pair *pairs)
 			int i;
 			ir_node *res = NULL;
 
-			for (i = get_irn_intra_arity(p->new_node) - 1; i >= 0; --i) {
+			for (i = get_irn_arity(p->new_node) - 1; i >= 0; --i) {
 				ir_node *pred = get_irn_n(p->new_node, i);
 
 				if (pred != p->old_node) {