X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_osr.c;h=569d9d060e8bc43ac87135fa81ac77cd987a65bb;hb=af82344c3d1ede9a28e652302a8c2bac7bb1c743;hp=9f8043e992d96af87f63c02dc83fca603fecfaad;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm diff --git a/ir/opt/opt_osr.c b/ir/opt/opt_osr.c index 9f8043e99..569d9d060 100644 --- a/ir/opt/opt_osr.c +++ b/ir/opt/opt_osr.c @@ -608,13 +608,12 @@ static int is_counter_iv(ir_node *iv, iv_env *env) */ static int check_users_for_reg_pressure(ir_node *iv, iv_env *env) { - ir_node *irn, *header; + ir_node *irn; ir_node *have_user = NULL; ir_node *have_cmp = NULL; node_entry *e = get_irn_ne(iv, env); scc *pscc = e->pscc; - header = e->header; for (irn = pscc->head; irn != NULL; irn = e->next) { const ir_edge_t *edge; @@ -1275,7 +1274,8 @@ static void lftr(ir_graph *irg, iv_env *env) */ static void clear_and_fix(ir_node *irn, void *env) { - int *moved = (int*)env; + (void)env; + set_irn_link(irn, NULL); if (is_Proj(irn)) { @@ -1284,7 +1284,6 @@ static void clear_and_fix(ir_node *irn, void *env) if (get_nodes_block(irn) != pred_block) { set_nodes_block(irn, pred_block); - *moved = 1; } } } /* clear_and_fix */ @@ -1294,7 +1293,6 @@ static void clear_and_fix(ir_node *irn, void *env) void remove_phi_cycles(ir_graph *irg) { iv_env env; - int projs_moved; FIRM_DBG_REGISTER(dbg, "firm.opt.remove_phi"); @@ -1317,10 +1315,7 @@ void remove_phi_cycles(ir_graph *irg) * the same block as their predecessors. * This can improve the placement of new nodes. */ - projs_moved = 0; - irg_walk_graph(irg, NULL, clear_and_fix, &projs_moved); - if (projs_moved) - set_irg_outs_inconsistent(irg); + irg_walk_graph(irg, NULL, clear_and_fix, NULL); /* we need outs for calculating the post order */ assure_irg_outs(irg); @@ -1334,7 +1329,6 @@ void remove_phi_cycles(ir_graph *irg) ir_free_resources(irg, IR_RESOURCE_IRN_LINK); if (env.replaced) { - set_irg_outs_inconsistent(irg); DB((dbg, LEVEL_1, "remove_phi_cycles: %u Cycles removed\n\n", env.replaced)); } @@ -1420,7 +1414,6 @@ void opt_osr(ir_graph *irg, unsigned flags) { iv_env env; int edges; - int projs_moved; FIRM_DBG_REGISTER(dbg, "firm.opt.osr"); @@ -1443,10 +1436,7 @@ void opt_osr(ir_graph *irg, unsigned flags) * the same block as its predecessors. * This can improve the placement of new nodes. */ - projs_moved = 0; - irg_walk_graph(irg, NULL, clear_and_fix, &projs_moved); - if (projs_moved) - set_irg_outs_inconsistent(irg); + irg_walk_graph(irg, NULL, clear_and_fix, NULL); /* we need dominance */ assure_doms(irg); @@ -1469,7 +1459,6 @@ void opt_osr(ir_graph *irg, unsigned flags) lftr(irg, &env); (void)lftr; - set_irg_outs_inconsistent(irg); DB((dbg, LEVEL_1, "Replacements: %u + %u (lftr)\n\n", env.replaced, env.lftr_replaced)); } ir_free_resources(irg, IR_RESOURCE_IRN_LINK);