X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=dc3ee7a030e793ea96401a8bb74939dbce004744;hb=dd4cd761ab637d4488c7e29f49843b1b02366acf;hp=70bd6426eb5f5bb88d8b5a89e3a200a8515b5412;hpb=b1e633cca47bf88931dcc9a34c65dc62798eb1d3;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 70bd6426e..dc3ee7a03 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -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"
 
@@ -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);
 
@@ -208,11 +209,20 @@ static void remove_empty_block(ir_node *block)
 			set_nodes_block(node, succ_block);
 			continue;
 		}
+		if (is_Sync(node)) {
+			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 */
@@ -235,7 +245,7 @@ int be_remove_empty_blocks(ir_graph *irg)
 
 	blocks_removed = 0;
 
-	set_using_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);
@@ -246,13 +256,14 @@ int be_remove_empty_blocks(ir_graph *irg)
 			continue;
 		remove_empty_block(pred);
 	}
-	clear_using_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;
 }