X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fifconv.c;h=ce71867ef95d5f5edd5fef71fa4fb8063516483e;hb=a0b404e08ed8a533027d665633411b0c9b0a9579;hp=cfd2e04bce998ca438aa516788ffbacdbe05e2cc;hpb=7603e336b06a31379716d1b5ad627087b26de7c8;p=libfirm

diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c
index cfd2e04bc..ce71867ef 100644
--- a/ir/opt/ifconv.c
+++ b/ir/opt/ifconv.c
@@ -70,7 +70,7 @@ static const ir_settings_if_conv_t default_info = {
  * Returns non-zero if a Block can be emptied.
  */
 static int can_empty_block(ir_node *block) {
-	return !get_Block_mark(block);
+	return get_Block_mark(block) == 0;
 }
 
 
@@ -172,7 +172,7 @@ static void split_block(ir_node* block, int i, int j)
 	ir_node* pred_block = get_nodes_block(get_irn_n(block, i));
 	int arity = get_irn_arity(block);
 	int new_pred_arity;
-	ir_node* phi;
+	ir_node *phi, *next;
 	ir_node **ins;
 	ir_node **pred_ins;
 	int k;
@@ -202,10 +202,11 @@ static void split_block(ir_node* block, int i, int j)
 	new_pred_arity = get_irn_arity(pred_block) - 1;
 	NEW_ARR_A(ir_node*, pred_ins, new_pred_arity);
 
-	for (phi = get_Block_phis(pred_block); phi != NULL; phi = get_Phi_next(phi)) {
+	for (phi = get_Block_phis(pred_block); phi != NULL; phi = next) {
 		for (k = 0; k < j; ++k) pred_ins[k] = get_irn_n(phi, k);
 		for (; k < new_pred_arity; ++k) pred_ins[k] = get_irn_n(phi, k + 1);
 		assert(k == new_pred_arity);
+		next = get_Phi_next(phi);
 		if (new_pred_arity > 1) {
 			set_irn_in(phi, new_pred_arity, pred_ins);
 		} else {
@@ -260,7 +261,7 @@ restart:
 		ir_node* pred0;
 		ir_cdep* cdep;
 
-		pred0 = get_nodes_block(get_irn_n(block, i));
+		pred0 = get_Block_cfgpred_block(block, i);
 		for (cdep = find_cdep(pred0); cdep != NULL; cdep = cdep->next) {
 			const ir_node* dependency = cdep->node;
 			ir_node* projx0 = walk_to_projx(pred0, dependency);
@@ -283,7 +284,7 @@ restart:
 				ir_node* pred1;
 				dbg_info* cond_dbg;
 
-				pred1 = get_nodes_block(get_irn_n(block, j));
+				pred1 = get_Block_cfgpred_block(block, j);
 
 				if (!is_cdep_on(pred1, dependency)) continue;
 
@@ -349,18 +350,23 @@ restart:
 				exchange(get_nodes_block(get_irn_n(block, j)), psi_block);
 
 				if (arity == 2) {
+					unsigned mark;
 #if 1
 					DB((dbg, LEVEL_1,  "Welding block %+F and %+F\n", block, psi_block));
 					/* copy the block-info from the Psi-block to the block before merging */
-					set_Block_mark(psi_block, get_Block_mark(psi_block) | get_Block_mark(block));
-					set_irn_link(block, get_irn_link(psi_block));
+
+					mark =  get_Block_mark(psi_block) | get_Block_mark(block);
+					set_Block_mark(block, mark);
+					set_Block_phis(block, get_Block_phis(psi_block));
 
 					set_irn_in(block, get_irn_arity(psi_block), get_irn_in(psi_block) + 1);
 					exchange_cdep(psi_block, block);
 					exchange(psi_block, block);
 #else
 					DB((dbg, LEVEL_1,  "Welding block %+F to %+F\n", block, psi_block));
-					set_Block_mark(psi_block, get_Block_mark(psi_block) | get_Block_mark(block));
+					mark =  get_Block_mark(psi_block) | get_Block_mark(block);
+					/* mark both block just to be sure, should be enough to mark psi_block */
+					set_Block_mark(psi_block, mark);
 					exchange(block, psi_block);
 #endif
 					return;
@@ -378,6 +384,7 @@ restart:
  */
 static void init_block_link(ir_node *block, void *env)
 {
+	(void)env;
 	set_Block_mark(block, 0);
 	set_Block_phis(block, NULL);
 }