BugFix: equivalent_node_Bound() was too greedy, reduced to a safe minimum (now mostly...

[libfirm] / ir / ir / irgmod.c

diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c
index a7d943d..6a4039a 100644 (file)
--- a/ir/ir/irgmod.c
+++ b/ir/ir/irgmod.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.
  *
@@ -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
@@ -53,11 +54,12 @@ void turn_into_tuple(ir_node *node, int arity) {
        } else {
                /* don't use get_nodes_block here, we allow turn_into_tuple for unpinned nodes */
                ir_node *block = get_irn_n(node, -1);
-               /* Allocate new array, don't free old in_array, it's on the obstack. */
                edges_node_deleted(node, current_ir_graph);
+               /* Allocate new array, don't free old in_array, it's on the obstack. */
                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 */
                memset(node->in, 0, (arity+1) * sizeof(node->in[0]));
+               /* set the block back */
                set_irn_n(node, -1, block);
        }
 }
@@ -103,9 +105,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");
                        }
                }
 
@@ -126,6 +126,7 @@ 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)));
@@ -210,12 +211,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);
+}