X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=dc3ee7a030e793ea96401a8bb74939dbce004744;hb=93da909d12b7bec51aa36ee5f05966c331f90fb9;hp=5e3dcb0b34c5286fb4deba1427897a78e1616e6d;hpb=71712d24f429b174d735ae063bcfcf529acc8489;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 5e3dcb0b3..dc3ee7a03 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"
 
@@ -84,7 +85,7 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 						   const arch_register_class_t *cls,
 						   ir_node *pos)
 {
-	const arch_env_t *arch_env = &birg->main_env->arch_env;
+	const arch_env_t *arch_env = birg->main_env->arch_env;
 	be_lv_t *lv     = birg->lv;
 	ir_node *bl     = is_Block(pos) ? pos : get_nodes_block(pos);
 	ir_graph *irg   = get_irn_irg(bl);
@@ -192,7 +193,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 +213,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 +245,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 +256,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;
 }