X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=472d8410b7d7c4d1308ffbe06e84ba128087760c;hb=d4bbab11371a9c68aa2a716eaa7589b82a28691e;hp=cfcbac607555d0569b571ca0832f10bc7425f86b;hpb=ad3044e4b2b1bbee1759621ddbd8ff987fa1de2b;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index cfcbac607..472d8410b 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -53,6 +53,7 @@
 #include "iredges_t.h"
 #include "irgraph_t.h"
 #include "irgopt.h"
+#include "irgmod.h"
 #include "irprintf_t.h"
 #include "irgwalk.h"
 
@@ -105,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;
@@ -123,7 +124,7 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 	curr = perm;
 	for (i = 0; i < n; ++i) {
 		ir_node *perm_op = get_irn_n(perm, i);
-		const arch_register_t *reg = arch_get_irn_register(arch_env, perm_op);
+		const arch_register_t *reg = arch_get_irn_register(perm_op);
 		be_ssa_construction_env_t senv;
 
 		ir_mode *mode = get_irn_mode(perm_op);
@@ -160,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;
 
@@ -192,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);
 
@@ -212,11 +212,16 @@ 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);
 	}
 
 	set_Block_cfgpred(block, 0, new_Bad());
-	be_kill_node(jump);
+	kill_node(jump);
 	blocks_removed = 1;
 
 	/* check predecessor */
@@ -239,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);
@@ -250,13 +255,14 @@ 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 */
 		set_irg_doms_inconsistent(irg);
 		set_irg_extblk_inconsistent(irg);
 		set_irg_outs_inconsistent(irg);
+		set_irg_loopinfo_inconsistent(irg);
 	}
 	return blocks_removed;
 }