X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=f38994b2827e0098a139b6e027f10b64c1934b22;hb=7d070c58e7bef1ed875fac066b57f29de449724b;hp=810f225bfbb3dcfea8bd9cbe580b9b0d99d87090;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index 810f225bf..f38994b28 100644
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -245,6 +245,8 @@ static ir_node *set_phi_arguments(ir_node *phi, int pos)
 		if (is_Bad(cfgpred)) {
 			value = new_r_Bad(irg);
 		} else {
+			inc_irg_visited(irg);
+
 			value = get_r_value_internal(cfgpred, pos, mode);
 		}
 		in[i] = value;
@@ -277,12 +279,19 @@ static ir_node *set_phi_arguments(ir_node *phi, int pos)
  */
 static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
 {
-	ir_node *res = block->attr.block.graph_arr[pos];
+	ir_node  *res = block->attr.block.graph_arr[pos];
+	ir_graph *irg = get_irn_irg(block);
 	if (res != NULL)
 		return res;
 
+	/* 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);
+	}
+
 	/* in a matured block we can immediately determine the phi arguments */
-	if (block->attr.block.is_matured) {
+	if (get_Block_matured(block)) {
 		int arity = get_irn_arity(block);
 		/* no predecessors: use unknown value */
 		if (arity == 0 && block == get_irg_start_block(get_irn_irg(block))) {
@@ -357,7 +366,7 @@ void mature_immBlock(ir_node *block)
 		}
 	}
 
-	block->attr.block.is_matured = 1;
+	set_Block_matured(block, 1);
 
 	/* Now, as the block is a finished Firm node, we can optimize it.
 	   Since other nodes have been allocated since the block was created
@@ -491,8 +500,7 @@ ir_node *new_rd_immBlock(dbg_info *dbgi, ir_graph *irg)
 	/* creates a new dynamic in-array as length of in is -1 */
 	res = new_ir_node(dbgi, irg, NULL, op_Block, mode_BB, -1, NULL);
 
-	res->attr.block.is_matured  = 0;
-	res->attr.block.is_dead     = 0;
+	set_Block_matured(res, 0);
 	res->attr.block.irg.irg     = irg;
 	res->attr.block.backedge    = NULL;
 	res->attr.block.in_cg       = NULL;
@@ -533,7 +541,7 @@ void add_immBlock_pred(ir_node *block, ir_node *jmp)
 	int n = ARR_LEN(block->in) - 1;
 
 	assert(is_Block(block) && "Error: Must be a Block");
-	assert(!block->attr.block.is_matured && "Error: Block already matured!\n");
+	assert(!get_Block_matured(block) && "Error: Block already matured!\n");
 	assert(is_ir_node(jmp));
 
 	ARR_APP1(ir_node *, block->in, jmp);
@@ -567,6 +575,7 @@ ir_node *get_r_value(ir_graph *irg, int pos, ir_mode *mode)
 {
 	assert(get_irg_phase_state(irg) == phase_building);
 	assert(pos >= 0);
+	inc_irg_visited(irg);
 
 	return get_r_value_internal(irg->current_block, pos + 1, mode);
 }
@@ -586,9 +595,8 @@ static ir_mode *guess_recursively(ir_node *block, int pos)
 	int      n_preds;
 	int      i;
 
-	if (irn_visited(block))
+	if (irn_visited_else_mark(block))
 		return NULL;
-	mark_irn_visited(block);
 
 	/* already have a defintion -> we can simply look at its mode */
 	value = block->attr.block.graph_arr[pos];
@@ -665,6 +673,7 @@ int find_value(ir_node *value)
 ir_node *get_r_store(ir_graph *irg)
 {
 	assert(get_irg_phase_state(irg) == phase_building);
+	inc_irg_visited(irg);
 	return get_r_value_internal(irg->current_block, 0, mode_M);
 }
 
@@ -716,14 +725,10 @@ void set_store(ir_node *store)
 	set_r_store(current_ir_graph, store);
 }
 
-void r_keep_alive(ir_graph *irg, ir_node *ka)
-{
-	add_End_keepalive(get_irg_end(irg), ka);
-}
-
 void keep_alive(ir_node *ka)
 {
-	r_keep_alive(current_ir_graph, ka);
+	ir_graph *irg = get_irn_irg(ka);
+	add_End_keepalive(get_irg_end(irg), ka);
 }
 
 void ir_set_uninitialized_local_variable_func(