X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fifconv.c;h=78184eece588af3335b57e6b8d6e1ed8e66111d1;hb=b27ae245166bb695bc4e418ff416d91bc37d0f28;hp=15152abbf6f8ad7103763c6071a11ca517d0dc0c;hpb=b8f889ed4dfd8b2a198a34a81e86efd5e9437b8d;p=libfirm

diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c
index 15152abbf..78184eece 100644
--- a/ir/opt/ifconv.c
+++ b/ir/opt/ifconv.c
@@ -193,58 +193,53 @@ static void rewire(ir_node* node, int i, int j, ir_node* new_pred)
  */
 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, *next;
-	ir_node **ins;
+	ir_node  *pred_block = get_nodes_block(get_irn_n(block, i));
+	int       arity      = get_irn_arity(block);
+	ir_node **ins        = ALLOCAN(ir_node*, arity + 1);
+	int       new_pred_arity;
+	ir_node  *phi;
+	ir_node  *next;
 	ir_node **pred_ins;
-	int k;
+	int       k;
 
 	DB((dbg, LEVEL_1, "Splitting predecessor %d of predecessor %d of %+F\n", j, i, block));
 
-	NEW_ARR_A(ir_node*, ins, arity + 1);
-
 	for (phi = get_Block_phis(block); phi != NULL; phi = get_Phi_next(phi)) {
 		ir_node* copy = copy_to(get_irn_n(phi, i), pred_block, j);
 
 		for (k = 0; k < i; ++k) ins[k] = get_irn_n(phi, k);
 		ins[k++] = copy;
 		for (; k < arity; ++k) ins[k] = get_irn_n(phi, k);
-		ins[k] = get_irn_n(phi, i);
-		assert(k == arity);
-		set_irn_in(phi, arity + 1, ins);
+		ins[k++] = get_irn_n(phi, i);
+		set_irn_in(phi, k, ins);
 	}
 
 	for (k = 0; k < i; ++k) ins[k] = get_irn_n(block, k);
 	ins[k++] = get_irn_n(pred_block, j);
 	for (; k < arity; ++k) ins[k] = get_irn_n(block, k);
-	ins[k] = get_irn_n(block, i);
-	assert(k == arity);
-	set_irn_in(block, arity + 1, ins);
+	ins[k++] = get_irn_n(block, i);
+	set_irn_in(block, k, ins);
 
 	new_pred_arity = get_irn_arity(pred_block) - 1;
-	NEW_ARR_A(ir_node*, pred_ins, new_pred_arity);
+	pred_ins       = ALLOCAN(ir_node*, new_pred_arity);
 
 	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 {
+		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);
+		if (k == 1) {
 			exchange(phi, pred_ins[0]);
+		} else {
+			set_irn_in(phi, k, pred_ins);
 		}
 	}
 
-	for (k = 0; k < j; ++k) pred_ins[k] = get_irn_n(pred_block, k);
-	for (; k < new_pred_arity; ++k) pred_ins[k] = get_irn_n(pred_block, k + 1);
-	assert(k == new_pred_arity);
-	if (new_pred_arity > 1) {
-		set_irn_in(pred_block, new_pred_arity, pred_ins);
-	} else {
+	for (k = 0; k != j;              ++k) pred_ins[k] = get_irn_n(pred_block, k);
+	for (;      k != new_pred_arity; ++k) pred_ins[k] = get_irn_n(pred_block, k + 1);
+	if (k == 1) {
 		exchange(pred_block, get_nodes_block(pred_ins[0]));
+	} else {
+		set_irn_in(pred_block, k, pred_ins);
 	}
 }
 
@@ -288,6 +283,8 @@ restart:
 		ir_cdep* cdep;
 
 		pred0 = get_Block_cfgpred_block(block, i);
+		if (pred0 == block) continue;
+
 		for (cdep = find_cdep(pred0); cdep != NULL; cdep = get_cdep_next(cdep)) {
 			const ir_node* dependency = get_cdep_node(cdep);
 			ir_node* projx0 = walk_to_projx(pred0, dependency);
@@ -315,6 +312,7 @@ restart:
 				dbg_info* cond_dbg;
 
 				pred1 = get_Block_cfgpred_block(block, j);
+				if (pred1 == block) continue;
 
 				if (!is_cdep_on(pred1, dependency)) continue;
 
@@ -479,6 +477,8 @@ void opt_if_conv(ir_graph *irg)
 
 	DB((dbg, LEVEL_1, "Running if-conversion on %+F\n", irg));
 
+	env.changed |= remove_bads(irg);
+
 	normalize_one_return(irg);
 	remove_critical_cf_edges(irg);
 
@@ -496,9 +496,7 @@ void opt_if_conv(ir_graph *irg)
 		local_optimize_graph(irg);
 
 		/* graph has changed, invalidate analysis info */
-		set_irg_outs_inconsistent(irg);
 		set_irg_extblk_inconsistent(irg);
-		set_irg_loopinfo_inconsistent(irg);
 		set_irg_doms_inconsistent(irg);
 	}