X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeflags.c;h=97905da5d10c3e1bc3c8af3888dd173b5013d825;hb=5cb14f12bacb0c7d1c646112b4660d57e14236a2;hp=1adde1a7246f0b534ba163e2d6a76bbd5fa7c30f;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/beflags.c b/ir/be/beflags.c
index 1adde1a72..97905da5d 100644
--- a/ir/be/beflags.c
+++ b/ir/be/beflags.c
@@ -127,7 +127,7 @@ static int can_move(ir_node *node, ir_node *after)
 }
 
 static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
-                                  ir_node *flag_consumers, int pn)
+                                  ir_node *flag_consumers, int pn, be_lv_t *lv)
 {
 	ir_node *n;
 	ir_node *copy;
@@ -139,6 +139,7 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 		/* move it */
 		sched_remove(flags_needed);
 		sched_add_after(node, flags_needed);
+		/* No need to update liveness, because the node stays in the same block */
 		return;
 	}
 
@@ -168,6 +169,17 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 		}
 		n = get_irn_link(n);
 	} while(n != NULL);
+
+	/* No need to introduce the copy, because it only lives in this block, but
+	 * we have to update the liveness of all operands */
+	if (is_Block(node) ||
+			get_nodes_block(node) != get_nodes_block(flags_needed)) {
+		int i;
+
+		for (i = get_irn_arity(copy) - 1; i >= 0; --i) {
+			be_liveness_update(lv, get_irn_n(copy, i));
+		}
+	}
 }
 
 static int is_modify_flags(ir_node *node) {
@@ -202,7 +214,6 @@ static void fix_flags_walker(ir_node *block, void *env)
 	ir_node *flags_needed   = NULL;
 	ir_node *flag_consumers = NULL;
 	int      pn = -1;
-	(void) env;
 
 	sched_foreach_reverse(block, node) {
 		int i, arity;
@@ -220,7 +231,7 @@ static void fix_flags_walker(ir_node *block, void *env)
 		/* test whether node destroys the flags */
 		if(flags_needed != NULL && is_modify_flags(node)) {
 			/* rematerialize */
-			rematerialize_or_move(flags_needed, node, flag_consumers, pn);
+			rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
 			flags_needed   = NULL;
 			flag_consumers = NULL;
 		}
@@ -245,7 +256,7 @@ static void fix_flags_walker(ir_node *block, void *env)
 		if(skip_Proj(new_flags_needed) != flags_needed) {
 			if(flags_needed != NULL) {
 				/* rematerialize node */
-				rematerialize_or_move(flags_needed, node, flag_consumers, pn);
+				rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
 				flags_needed   = NULL;
 				flag_consumers = NULL;
 			}
@@ -268,7 +279,7 @@ static void fix_flags_walker(ir_node *block, void *env)
 
 	if(flags_needed != NULL) {
 		assert(get_nodes_block(flags_needed) != block);
-		rematerialize_or_move(flags_needed, node, flag_consumers, pn);
+		rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
 		flags_needed   = NULL;
 		flag_consumers = NULL;
 	}
@@ -290,9 +301,9 @@ void be_sched_fix_flags(be_irg_t *birg, const arch_register_class_t *flag_cls,
 	if(remat == NULL)
 		remat = &default_remat;
 
-	set_using_irn_link(irg);
-	irg_block_walk_graph(irg, fix_flags_walker, NULL, NULL);
-	clear_using_irn_link(irg);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+	irg_block_walk_graph(irg, fix_flags_walker, NULL, birg->lv);
+	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 
 	if(changed) {
 		be_remove_dead_nodes_from_schedule(birg);