X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=88c54975028f6d4d260bde34af82bfaac1c6cfab;hb=b519dd6a1e6d85e843eff533be787d1f138a07ff;hp=0167e8af1768135d1cf1c7907e6436eee1367cd8;hpb=a142727aca4ef56cf754045fc0129b6d1b840a63;p=libfirm

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index 0167e8af1..88c549750 100644
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.c
@@ -38,6 +38,7 @@
 #include "irhooks.h"
 #include "iredges_t.h"
 #include "irtools.h"
+#include "error.h"
 
 /**
  * Turns a node into a "useless" Tuple.  The Tuple just forms a tuple
@@ -45,15 +46,14 @@
  * This is useful if a node returning a tuple is removed, but the Projs
  * extracting values from the tuple are not available.
  */
-void turn_into_tuple (ir_node *node, int arity)
-{
+void turn_into_tuple(ir_node *node, int arity) {
 	assert(node);
 	set_irn_op(node, op_Tuple);
 	if (get_irn_arity(node) == arity) {
 		/* keep old array */
 	} else {
-		/* Allocate new array, don't free old in_array, it's on the obstack. */
 		ir_node *block = get_nodes_block(node);
+		/* Allocate new array, don't free old in_array, it's on the obstack. */
 		edges_node_deleted(node, current_ir_graph);
 		node->in = NEW_ARR_D(ir_node *, current_ir_graph->obst, arity+1);
 		/* clear the new in array, else edge_notify tries to delete garbage */
@@ -67,8 +67,7 @@ void turn_into_tuple (ir_node *node, int arity)
  * Since `new' may be bigger than `old' replace `old'
  * by an op_Id which is smaller than everything.
  */
-void exchange(ir_node *old, ir_node *nw)
-{
+void exchange(ir_node *old, ir_node *nw) {
 	ir_graph *irg;
 
 	assert(old && nw);
@@ -80,9 +79,9 @@ void exchange(ir_node *old, ir_node *nw)
 	hook_replace(old, nw);
 
 	/*
-	* If new outs are on, we can skip the id node creation and reroute
-	* the edges from the old node to the new directly.
-	*/
+	 * If new outs are on, we can skip the id node creation and reroute
+	 * the edges from the old node to the new directly.
+	 */
 	if (edges_activated(irg)) {
 		/* copy all dependencies from old to new */
 		add_irn_deps(nw, old);
@@ -91,8 +90,7 @@ void exchange(ir_node *old, ir_node *nw)
 		edges_reroute_kind(old, nw, EDGE_KIND_DEP, irg);
 		edges_node_deleted(old, irg);
 		old->op = op_Bad;
-	}
-	else {
+	} else {
 		/* Else, do it the old-fashioned way. */
 		ir_node *block;
 
@@ -105,9 +103,7 @@ void exchange(ir_node *old, ir_node *nw)
 			block = is_Block(nw) ? nw : get_nodes_block(nw);
 
 			if (! block) {
-				DDMN(old);
-				DDMN(nw);
-				assert(0 && "cannot find legal block for id");
+				panic("cannot find legal block for id");
 			}
 		}
 
@@ -128,12 +124,12 @@ void exchange(ir_node *old, ir_node *nw)
  */
 static void collect(ir_node *n, void *env) {
 	ir_node *pred;
+	(void) env;
 
 	if (is_Phi(n)) {
 		set_irn_link(n, get_irn_link(get_nodes_block(n)));
 		set_irn_link(get_nodes_block(n), n);
-	}
-	else if (is_Proj(n)) {
+	} else if (is_Proj(n)) {
 		pred = n;
 		do {
 			pred = get_Proj_pred(pred);
@@ -213,12 +209,21 @@ void part_block(ir_node *node) {
 	set_irn_link(new_block, phi);
 	set_irn_link(old_block, NULL);
 	while (phi) {
-		if(get_nodes_block(phi) == old_block);   /* @@@ inlinening chokes on phis that don't
-												 obey this condition.  How do they get into
-												 the list??? Example: InterfaceIII */
 		set_nodes_block(phi, new_block);
 		phi = get_irn_link(phi);
 	}
 
 	set_optimize(rem_opt);
 }
+
+/* kill a node by setting its predecessors to Bad and finally exchange the node by Bad itself. */
+void kill_node(ir_node *node) {
+	ir_graph *irg = get_irn_irg(node);
+	ir_node *bad = get_irg_bad(irg);
+	int i;
+
+	for (i = get_irn_arity(node) - 1; i >= -1; --i) {
+		set_irn_n(node, i, bad);
+	}
+	exchange(node, bad);
+}