X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=b2b081682c364b563bfad61a2b70c6c5657126d6;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=5b2725bffc272b97099021788ae8ad0e342b2665;hpb=2d9776010c3f48b99e88e4199f201ba8531dbde8;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 5b2725bff..b2b081682 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -106,7 +106,7 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 		return NULL;
 	}
 
-	nodes = xmalloc(n * sizeof(nodes[0]));
+	nodes = XMALLOCN(ir_node*, n);
 
 	DBG((dbg, LEVEL_1, "live:\n"));
 	i = 0;
@@ -161,10 +161,9 @@ static void remove_empty_block(ir_node *block)
 	ir_node *succ_block;
 	ir_node *jump = NULL;
 
-	if (irn_visited(block))
+	if (irn_visited_else_mark(block))
 		return;
 
-	mark_irn_visited(block);
 	if (get_Block_n_cfgpreds(block) != 1)
 		goto check_preds;
 
@@ -193,7 +192,7 @@ static void remove_empty_block(ir_node *block)
 	}
 
 	/* there can be some non-scheduled Pin nodes left in the block, move them
-	 * to the succ block */
+	 * to the succ block (Pin) or pred block (Sync) */
 	foreach_out_edge_safe(block, edge, next) {
 		node = get_edge_src_irn(edge);
 
@@ -213,6 +212,11 @@ static void remove_empty_block(ir_node *block)
 			set_nodes_block(node, get_nodes_block(pred));
 			continue;
 		}
+		if (is_End(node)) { /* End-keep, reroute it to the successor */
+			int pos = get_edge_src_pos(edge);
+			set_irn_n(node, pos, succ_block);
+			continue;
+		}
 		panic("Unexpected node %+F in block %+F with empty schedule", node, block);
 	}
 
@@ -240,7 +244,7 @@ int be_remove_empty_blocks(ir_graph *irg)
 
 	blocks_removed = 0;
 
-	set_using_irn_visited(irg);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
 	inc_irg_visited(irg);
 	remove_empty_block(get_irg_end_block(irg));
 	end   = get_irg_end(irg);
@@ -251,7 +255,7 @@ int be_remove_empty_blocks(ir_graph *irg)
 			continue;
 		remove_empty_block(pred);
 	}
-	clear_using_irn_visited(irg);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
 	if (blocks_removed) {
 		/* invalidate analysis info */