maybe fix phi handler problems

[r14927]

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index e58b808..6dac697 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -323,9 +323,6 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
        /* Ensure, that the ir_edges are computed. */
        edges_assure(irg);
 
-       /* reset the phi handler. */
-       be_phi_handler_reset(env->phi_handler);
-
        set_irg_phase_state(irg, phase_backend);
 
        dump(DUMP_INITIAL, irg, "-prepared", dump_ir_block_graph);
@@ -450,6 +447,9 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                /* set the current graph (this is important for several firm functions) */
                current_ir_graph = irg;
 
+               /* reset the phi handler. */
+               be_phi_handler_reset(env.phi_handler);
+
 #ifdef FIRM_STATISTICS
                stat_ev_ctx_push_fobj("irg", irg);
 #endif
@@ -490,9 +490,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                /* some transformations need to be done before abi introduce */
                arch_code_generator_before_abi(birg->cg);
 
-               /* reset the phi handler. */
-               be_phi_handler_reset(env.phi_handler);
-
                /* implement the ABI conventions. */
                BE_TIMER_PUSH(t_abi);
                birg->abi = be_abi_introduce(birg);
@@ -514,6 +511,9 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                arch_code_generator_prepare_graph(birg->cg);
                BE_TIMER_POP(t_codegen);
 
+               /* reset the phi handler. */
+               be_phi_handler_reset(env.phi_handler);
+
                be_do_stat_nodes(irg, "03 Prepare");
 
                dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);

diff --git a/ir/be/benode.c b/ir/be/benode.c
index a7832e9..09d290e 100644 (file)
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -1605,8 +1605,9 @@ arch_irn_handler_t *be_phi_handler_new(const arch_env_t *arch_env)
 
 void be_phi_handler_free(arch_irn_handler_t *handler)
 {
-       phi_handler_t *h = (void *) handler;
+       phi_handler_t *h = get_phi_handler_from_handler(handler);
        pmap_destroy(h->phi_attrs);
+       h->phi_attrs = NULL;
        free(handler);
 }