Merge branch 'opt_manage'

[libfirm] / ir / be / bessaconstr.c

diff --git a/ir/be/bessaconstr.c b/ir/be/bessaconstr.c
index d88c5f1..0595e2c 100644 (file)
--- a/ir/be/bessaconstr.c
+++ b/ir/be/bessaconstr.c
@@ -240,9 +240,7 @@ static ir_node *insert_dummy_phi(be_ssa_construction_env_t *env, ir_node *block)
        }
        phi = be_new_Phi(block, n_preds, ins, env->mode, env->phi_cls);
        sched_add_after(block, phi);
-       if (env->new_phis != NULL) {
-               ARR_APP1(ir_node*, env->new_phis, phi);
-       }
+       ARR_APP1(ir_node*, env->new_phis, phi);
 
        DBG((dbg, LEVEL_2, "\tcreating phi %+F in %+F\n", phi, block));
        introduce_definition(env, phi);
@@ -473,7 +471,7 @@ void be_ssa_construction_add_copy(be_ssa_construction_env_t *env,
 
        if (env->mode == NULL) {
                env->mode    = get_irn_mode(copy);
-               env->phi_cls = arch_get_irn_reg_class_out(copy);
+               env->phi_cls = arch_get_irn_reg_class(copy);
        } else {
                assert(env->mode == get_irn_mode(copy));
        }
@@ -495,7 +493,7 @@ void be_ssa_construction_add_copies(be_ssa_construction_env_t *env,
 
        if (env->mode == NULL) {
                env->mode    = get_irn_mode(copies[0]);
-               env->phi_cls = arch_get_irn_reg_class_out(copies[0]);
+               env->phi_cls = arch_get_irn_reg_class(copies[0]);
        }
 
        for (i = 0; i < copies_len; ++i) {