X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=5a8c0257ccc996c424ffc8862dfe46e10f9eb0d1;hb=1de3ff1c7f4478924c6348f774608e60b962d055;hp=070d5c09da6471d8b511310ab4aba724247f6eef;hpb=aec2064a7e22cfb3a1934dd5a2bda677c2396b70;p=libfirm

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index 070d5c09d..5a8c0257c 100644
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -243,7 +243,7 @@ static ir_node *set_phi_arguments(ir_node *phi, int pos)
 		ir_node *cfgpred = get_Block_cfgpred_block(block, i);
 		ir_node *value;
 		if (is_Bad(cfgpred)) {
-			value = new_r_Bad(irg);
+			value = new_r_Bad(irg, mode);
 		} else {
 			inc_irg_visited(irg);
 
@@ -287,7 +287,7 @@ static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
 	/* We ran into a cycle. This may happen in unreachable loops. */
 	if (irn_visited_else_mark(block)) {
 		/* Since the loop is unreachable, return a Bad. */
-		return new_r_Bad(irg);
+		return new_r_Bad(irg, mode);
 	}
 
 	/* in a matured block we can immediately determine the phi arguments */
@@ -306,11 +306,12 @@ static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
 			}
 		/* one predecessor just use its value */
 		} else if (arity == 1) {
-			ir_node *cfgpred = get_Block_cfgpred_block(block, 0);
+			ir_node *cfgpred = get_Block_cfgpred(block, 0);
 			if (is_Bad(cfgpred)) {
-				res = cfgpred;
+				res = new_r_Bad(irg, mode);
 			} else {
-				res = get_r_value_internal(cfgpred, pos, mode);
+				ir_node *cfgpred_block = get_nodes_block(cfgpred);
+				res = get_r_value_internal(cfgpred_block, pos, mode);
 			}
 		/* multiple predecessors construct Phi */
 		} else {
@@ -501,7 +502,6 @@ ir_node *new_rd_immBlock(dbg_info *dbgi, ir_graph *irg)
 	res = new_ir_node(dbgi, irg, NULL, op_Block, mode_BB, -1, NULL);
 
 	set_Block_matured(res, 0);
-	res->attr.block.is_dead     = 0;
 	res->attr.block.irg.irg     = irg;
 	res->attr.block.backedge    = NULL;
 	res->attr.block.in_cg       = NULL;