X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcode_placement.c;h=2e3e5a60c308e6dc966168a34e58883e3cee22c7;hb=b27ae245166bb695bc4e418ff416d91bc37d0f28;hp=c8eccefd8003d0b0609b9f0d0a8dd1de9417f38e;hpb=d32deaaaf39ca256be208269c9a933c211439feb;p=libfirm

diff --git a/ir/opt/code_placement.c b/ir/opt/code_placement.c
index c8eccefd8..2e3e5a60c 100644
--- a/ir/opt/code_placement.c
+++ b/ir/opt/code_placement.c
@@ -45,14 +45,6 @@ static bool is_block_reachable(ir_node *block)
 	return get_Block_dom_depth(block) >= 0;
 }
 
-/* mark node as not-visited */
-static void clear_irn_visited(ir_node *node)
-{
-	ir_graph    *irg     = get_irn_irg(node);
-	ir_visited_t visited = get_irg_visited(irg);
-	set_irn_visited(node, visited-1);
-}
-
 /**
  * Find the earliest correct block for node n.  --- Place n into the
  * same Block as its dominance-deepest Input.
@@ -103,29 +95,12 @@ static void place_floats_early(ir_node *n, waitq *worklist)
 	}
 
 	block = get_nodes_block(n);
-	/* do not move unreachable code (or its predecessors around) since dominance
-	 * is inalid there */
-	if (!is_block_reachable(block))
-		return;
 
 	/* first move predecessors up */
 	arity = get_irn_arity(n);
 	place_floats_early(block, worklist);
 	for (i = 0; i < arity; ++i) {
-		ir_node *pred       = get_irn_n(n, i);
-		ir_node *pred_block = get_nodes_block(pred);
-
-		/* gcse can lead to predecessors of reachable code being unreachable.
-		 * Move them into the current block in this case */
-		if (!is_block_reachable(pred_block)) {
-			ir_node *new_pred_block = block;
-			assert(get_irn_pinned(pred) == op_pin_state_floats);
-			if (is_Phi(n)) {
-				new_pred_block = get_Block_cfgpred_block(block, i);
-			}
-			set_nodes_block(pred, new_pred_block);
-			clear_irn_visited(pred);
-		}
+		ir_node *pred = get_irn_n(n, i);
 		place_floats_early(pred, worklist);
 	}
 
@@ -236,8 +211,8 @@ static ir_node *consumer_dom_dca(ir_node *dca, ir_node *consumer,
 				if (is_Bad(new_block))
 					continue;
 
-				if (is_block_reachable(new_block))
-					dca = calc_dom_dca(dca, new_block);
+				assert(is_block_reachable(new_block));
+				dca = calc_dom_dca(dca, new_block);
 			}
 		}
 	} else {
@@ -306,10 +281,7 @@ static ir_node *get_deepest_common_dom_ancestor(ir_node *node, ir_node *dca)
 			 * the users of Proj are our users. */
 			dca = get_deepest_common_dom_ancestor(succ, dca);
 		} else {
-			/* ignore successors in unreachable code */
-			ir_node *succ_blk = get_nodes_block(succ);
-			if (!is_block_reachable(succ_blk))
-				continue;
+			assert(is_block_reachable(get_nodes_block(succ)));
 			dca = consumer_dom_dca(dca, succ, node);
 		}
 	}
@@ -385,10 +357,8 @@ static void place_floats_late(ir_node *n, pdeq *worklist)
 		return;
 	}
 
-	/* don't move unreachable code around */
 	block = get_nodes_block(n);
-	if (!is_block_reachable(block))
-		return;
+	assert(is_block_reachable(block));
 
 	/* deepest common ancestor in the dominator tree of all nodes'
 	   blocks depending on us; our final placement has to dominate
@@ -443,6 +413,9 @@ void place_code(ir_graph *irg)
 	worklist = new_waitq();
 	place_early(irg, worklist);
 
+	/* While GCSE might place nodes in unreachable blocks,
+	 * these are now placed in reachable blocks. */
+
 	/* Note: place_early changes only blocks, no data edges. So, the
 	 * data out edges are still valid, no need to recalculate them here. */
 
@@ -450,8 +423,6 @@ void place_code(ir_graph *irg)
 	   unnecessary executions of the node. */
 	place_late(irg, worklist);
 
-	set_irg_outs_inconsistent(irg);
-	set_irg_loopinfo_inconsistent(irg);
 	del_waitq(worklist);
 }