Make warning about registers assigned to Phi inputs more clear.

[libfirm] / ir / be / bepeephole.c

diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c
index cb1b145..1afc7ed 100644 (file)
--- a/ir/be/bepeephole.c
+++ b/ir/be/bepeephole.c
@@ -32,6 +32,7 @@
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf.h"
+#include "ircons.h"
 #include "irgmod.h"
 #include "error.h"
 
@@ -61,7 +62,7 @@ static void clear_reg_value(ir_node *node)
 
        reg     = arch_get_irn_register(arch_env, node);
        if(reg == NULL) {
-               panic("No register assigned at %+F\n", node);
+               panic("No register assigned at %+F", node);
        }
        if(arch_register_type_is(reg, virtual))
                return;
@@ -86,7 +87,7 @@ static void set_reg_value(ir_node *node)
 
        reg = arch_get_irn_register(arch_env, node);
        if(reg == NULL) {
-               panic("No register assigned at %+F\n", node);
+               panic("No register assigned at %+F", node);
        }
        if(arch_register_type_is(reg, virtual))
                return;
@@ -124,7 +125,7 @@ static void set_uses(ir_node *node)
        }
 }
 
-void be_peephole_new_node(ir_node *const nw)
+void be_peephole_new_node(ir_node * nw)
 {
        be_liveness_introduce(lv, nw);
 }
@@ -158,7 +159,7 @@ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node)
 
        reg = arch_get_irn_register(arch_env, old_node);
        if (reg == NULL) {
-               panic("No register assigned at %+F\n", old_node);
+               panic("No register assigned at %+F", old_node);
        }
        assert(reg == arch_get_irn_register(arch_env, new_node) &&
              "KILLING a node and replacing by different register is not allowed");
@@ -174,7 +175,7 @@ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node)
        be_liveness_remove(lv, old_node);
 }
 
-void be_peephole_exchange(ir_node *const old, ir_node *const nw)
+void be_peephole_exchange(ir_node *old, ir_node *nw)
 {
        be_peephole_before_exchange(old, nw);
        sched_remove(old);
@@ -232,6 +233,26 @@ static void process_block(ir_node *block, void *data)
        }
 }
 
+static void kill_node_and_preds(ir_node *node)
+{
+       int arity, i;
+
+       arity = get_irn_arity(node);
+       for (i = 0; i < arity; ++i) {
+               ir_node *pred = get_irn_n(node, i);
+
+               set_irn_n(node, i, new_Bad());
+               if (get_irn_n_edges(pred) != 0)
+                       continue;
+
+               kill_node_and_preds(pred);
+       }
+
+       if (!is_Proj(node))
+               sched_remove(node);
+       kill_node(node);
+}
+
 /**
  * Walk through the block schedule and skip all barrier nodes.
  */
@@ -239,21 +260,22 @@ static void skip_barrier(ir_node *ret_blk, ir_graph *irg) {
        ir_node *irn;
 
        sched_foreach_reverse(ret_blk, irn) {
-               if (be_is_Barrier(irn)) {
-                       const ir_edge_t *edge, *next;
-
-                       foreach_out_edge_safe(irn, edge, next) {
-                               ir_node *proj = get_edge_src_irn(edge);
-                               int      pn   = (int)get_Proj_proj(proj);
-                               ir_node *pred = get_irn_n(irn, pn);
-
-                               edges_reroute_kind(proj, pred, EDGE_KIND_NORMAL, irg);
-                               edges_reroute_kind(proj, pred, EDGE_KIND_DEP, irg);
-                       }
-                       sched_remove(irn);
-                       kill_node(irn);
-                       break;
+               const ir_edge_t *edge, *next;
+
+               if (!be_is_Barrier(irn))
+                       continue;
+
+               foreach_out_edge_safe(irn, edge, next) {
+                       ir_node *proj = get_edge_src_irn(edge);
+                       int      pn   = (int)get_Proj_proj(proj);
+                       ir_node *pred = get_irn_n(irn, pn);
+
+                       edges_reroute_kind(proj, pred, EDGE_KIND_NORMAL, irg);
+                       edges_reroute_kind(proj, pred, EDGE_KIND_DEP, irg);
                }
+
+               kill_node_and_preds(irn);
+               break;
        }
 }
 
@@ -361,4 +383,4 @@ void be_init_peephole(void)
        FIRM_DBG_REGISTER(dbg, "firm.be.peephole");
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillbelady);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_peephole);