fix things when WITH_JVM and WITH_ILP is defined

[libfirm] / ir / be / bespillbelady.c

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 507accc..fde941c 100644 (file)
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -317,7 +317,7 @@ static void displace(belady_env_t *env, workset_t *new_vals, int is_usage) {
                        to_insert[demand++] = val;
                        if (is_usage) {
                                DBG((dbg, DBG_SPILL, "Reload %+F before %+F\n", val, env->instr));
-                               be_add_reload(env->senv, val, env->instr);
+                               be_add_reload(env->senv, val, env->instr, env->cls);
                        }
                }
                else {
@@ -679,7 +679,7 @@ static void fix_block_borders(ir_node *block, void *data) {
                        /* irnb is not in memory at the end of pred, so we have to reload it */
                        DBG((dbg, DBG_FIX, "    reload %+F\n", irnb));
                        DBG((dbg, DBG_SPILL, "Reload %+F before %+F,%d\n", irnb, block, i));
-                       be_add_reload_on_edge(env->senv, irnb, block, i);
+                       be_add_reload_on_edge(env->senv, irnb, block, i, env->cls);
 
 next_value:
                        /*epsilon statement :)*/;
@@ -697,6 +697,8 @@ void be_spill_belady_spill_env(const be_chordal_env_t *chordal_env, spill_env_t
        FIRM_DBG_REGISTER(dbg, "firm.be.spill.belady");
        //firm_dbg_set_mask(dbg, DBG_SPILL);
 
+       be_assure_liveness(chordal_env->birg);
+
        /* init belady env */
        obstack_init(&env.ob);
        env.cenv      = chordal_env;