Adapted to previous commit.

[libfirm] / ir / be / bespill.c

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index f6d5ad2..573aaa1 100644 (file)
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -39,7 +39,7 @@
 #include "belive_t.h"
 #include "beirg.h"
 #include "bearch.h"
-#include "benode_t.h"
+#include "benode.h"
 #include "besched.h"
 #include "bera.h"
 #include "beintlive_t.h"
@@ -139,12 +139,6 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
                        if (rbitset_equal(req->limited, req2->limited, cls->n_regs))
                                continue;
 
-#if 0
-                       /* Matze: looks fishy to me disabled it for now */
-                       if (be_is_Copy(get_irn_n(insn->irn, a_op->pos)))
-                               continue;
-#endif
-
                        copy = be_new_Copy(cls, block, in);
                        stat_ev_int("constr_copy", 1);
 
@@ -203,7 +197,7 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
                req = arch_get_register_req(node, i);
                if (req->cls != cls)
                        continue;
-               if (! (req->type & arch_register_req_type_limited))
+               if (!(req->type & arch_register_req_type_limited))
                        continue;
 
                in = get_irn_n(node, i);
@@ -253,6 +247,9 @@ void be_pre_spill_prepare_constr(be_irg_t *birg,
        memset(&env, 0, sizeof(env));
        env.birg = birg;
        env.cls  = cls;
+
+       be_assure_liveness(birg);
+
        irg_block_walk_graph(irg, pre_spill_prepare_constr_walker, NULL, &env);
 }
 
@@ -280,9 +277,8 @@ void be_register_spiller(const char *name, be_spiller_t *spiller)
 void be_do_spill(be_irg_t *birg, const arch_register_class_t *cls)
 {
        assert(selected_spiller != NULL);
-       if (selected_spiller != NULL) {
-               selected_spiller->spill(birg, cls);
-       }
+
+       selected_spiller->spill(birg, cls);
 }
 
 void be_init_spilloptions(void)