Replace the reassoc env struct by its only member.

[libfirm] / ir / opt / ifconv.c

diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c
index 037c752..1bc7f13 100644 (file)
--- a/ir/opt/ifconv.c
+++ b/ir/opt/ifconv.c
@@ -21,7 +21,6 @@
  * @file    ir/opt/ifconv.c
  * @brief   If conversion
  * @author  Christoph Mallon
- * @version $Id$
  */
 #include "config.h"
 
@@ -52,7 +51,7 @@ typedef struct walker_env {
        bool                   changed; /**< Set if the graph was changed. */
 } walker_env;
 
-DEBUG_ONLY(static firm_dbg_module_t *dbg);
+DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
 /**
  * Returns non-zero if a Block can be emptied.
@@ -193,13 +192,14 @@ static void rewire(ir_node* node, int i, int j, ir_node* new_pred)
  */
 static void split_block(ir_node* block, int i, int j)
 {
-       ir_node* pred_block = get_nodes_block(get_irn_n(block, i));
-       int arity = get_irn_arity(block);
-       int new_pred_arity;
-       ir_node *phi, *next;
-       ir_node **ins = ALLOCAN(ir_node*, arity+1);
+       ir_node  *pred_block = get_nodes_block(get_irn_n(block, i));
+       int       arity      = get_irn_arity(block);
+       ir_node **ins        = ALLOCAN(ir_node*, arity + 1);
+       int       new_pred_arity;
+       ir_node  *phi;
+       ir_node  *next;
        ir_node **pred_ins;
-       int k;
+       int       k;
 
        DB((dbg, LEVEL_1, "Splitting predecessor %d of predecessor %d of %+F\n", j, i, block));
 
@@ -210,7 +210,6 @@ static void split_block(ir_node* block, int i, int j)
                ins[k++] = copy;
                for (; k < arity; ++k) ins[k] = get_irn_n(phi, k);
                ins[k++] = get_irn_n(phi, i);
-               assert(k == arity+1);
                set_irn_in(phi, k, ins);
        }
 
@@ -218,31 +217,28 @@ static void split_block(ir_node* block, int i, int j)
        ins[k++] = get_irn_n(pred_block, j);
        for (; k < arity; ++k) ins[k] = get_irn_n(block, k);
        ins[k++] = get_irn_n(block, i);
-       assert(k == arity+1);
        set_irn_in(block, k, ins);
 
        new_pred_arity = get_irn_arity(pred_block) - 1;
-       pred_ins = ALLOCAN(ir_node*, new_pred_arity);
+       pred_ins       = ALLOCAN(ir_node*, new_pred_arity);
 
        for (phi = get_Block_phis(pred_block); phi != NULL; phi = next) {
-               for (k = 0; k < j; ++k) pred_ins[k] = get_irn_n(phi, k);
-               for (; k < new_pred_arity; ++k) pred_ins[k] = get_irn_n(phi, k + 1);
-               assert(k == new_pred_arity);
                next = get_Phi_next(phi);
-               if (new_pred_arity > 1) {
-                       set_irn_in(phi, k, pred_ins);
-               } else {
+               for (k = 0; k != j;              ++k) pred_ins[k] = get_irn_n(phi, k);
+               for (;      k != new_pred_arity; ++k) pred_ins[k] = get_irn_n(phi, k + 1);
+               if (k == 1) {
                        exchange(phi, pred_ins[0]);
+               } else {
+                       set_irn_in(phi, k, pred_ins);
                }
        }
 
-       for (k = 0; k < j; ++k) pred_ins[k] = get_irn_n(pred_block, k);
-       for (; k < new_pred_arity; ++k) pred_ins[k] = get_irn_n(pred_block, k + 1);
-       assert(k == new_pred_arity);
-       if (new_pred_arity > 1) {
-               set_irn_in(pred_block, k, pred_ins);
-       } else {
+       for (k = 0; k != j;              ++k) pred_ins[k] = get_irn_n(pred_block, k);
+       for (;      k != new_pred_arity; ++k) pred_ins[k] = get_irn_n(pred_block, k + 1);
+       if (k == 1) {
                exchange(pred_block, get_nodes_block(pred_ins[0]));
+       } else {
+               set_irn_in(pred_block, k, pred_ins);
        }
 }
 
@@ -286,6 +282,8 @@ restart:
                ir_cdep* cdep;
 
                pred0 = get_Block_cfgpred_block(block, i);
+               if (pred0 == block) continue;
+
                for (cdep = find_cdep(pred0); cdep != NULL; cdep = get_cdep_next(cdep)) {
                        const ir_node* dependency = get_cdep_node(cdep);
                        ir_node* projx0 = walk_to_projx(pred0, dependency);
@@ -313,6 +311,7 @@ restart:
                                dbg_info* cond_dbg;
 
                                pred1 = get_Block_cfgpred_block(block, j);
+                               if (pred1 == block) continue;
 
                                if (!is_cdep_on(pred1, dependency)) continue;
 
@@ -469,6 +468,12 @@ void opt_if_conv(ir_graph *irg)
        walker_env            env;
        const backend_params *be_params = be_get_backend_param();
 
+       assure_irg_properties(irg,
+               IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES
+               | IR_GRAPH_PROPERTY_NO_UNREACHABLE_CODE
+               | IR_GRAPH_PROPERTY_NO_BADS
+               | IR_GRAPH_PROPERTY_ONE_RETURN);
+
        /* get the parameters */
        env.allow_ifconv = be_params->allow_ifconv;
        env.changed      = false;
@@ -477,9 +482,6 @@ void opt_if_conv(ir_graph *irg)
 
        DB((dbg, LEVEL_1, "Running if-conversion on %+F\n", irg));
 
-       normalize_one_return(irg);
-       remove_critical_cf_edges(irg);
-
        compute_cdep(irg);
 
        ir_reserve_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
@@ -492,15 +494,13 @@ void opt_if_conv(ir_graph *irg)
 
        if (env.changed) {
                local_optimize_graph(irg);
-
-               /* graph has changed, invalidate analysis info */
-               set_irg_outs_inconsistent(irg);
-               set_irg_extblk_inconsistent(irg);
-               set_irg_loopinfo_inconsistent(irg);
-               set_irg_doms_inconsistent(irg);
        }
 
        free_cdep(irg);
+
+       confirm_irg_properties(irg,
+               IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES
+               | IR_GRAPH_PROPERTY_ONE_RETURN);
 }
 
 ir_graph_pass_t *opt_if_conv_pass(const char *name)