Finally fix the "wrong" assert of r28379.

[libfirm] / ir / opt / return.c

diff --git a/ir/opt/return.c b/ir/opt/return.c
index 5eca06b..426f7e6 100644 (file)
--- a/ir/opt/return.c
+++ b/ir/opt/return.c
@@ -297,7 +297,7 @@ void normalize_n_returns(ir_graph *irg)
                dbg_info *dbgi  = get_irn_dbg_info(ret);
                ir_node  *phiM;
 
-               list = get_irn_link(ret);
+               list = (ir_node*)get_irn_link(ret);
                --n_rets;
 
                n = get_Block_n_cfgpreds(block);
@@ -366,7 +366,7 @@ void normalize_n_returns(ir_graph *irg)
         */
        in = ALLOCAN(ir_node*, n_finals);
 
-       for (i = 0; final; ++i, final = get_irn_link(final))
+       for (i = 0; final != NULL; ++i, final = (ir_node*)get_irn_link(final))
                in[i] = final;
 
        exchange(endbl, new_r_Block(irg, n_finals, in));
@@ -381,7 +381,7 @@ void normalize_n_returns(ir_graph *irg)
        set_irg_doms_inconsistent(irg);
        set_irg_extblk_inconsistent(irg);  /* may not be needed */
        set_irg_outs_inconsistent(irg);
-       set_irg_loopinfo_inconsistent(current_ir_graph);
+       set_irg_loopinfo_inconsistent(irg);
 }
 
 /* Create a graph pass. */