localopt: simple associativity optimisation

[libfirm] / ir / ir / ircons.c

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index 5a8c025..9b86858 100644 (file)
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -87,8 +87,8 @@ ir_node *new_rd_ASM(dbg_info *db, ir_node *block, int arity, ir_node *in[],
        memcpy(res->attr.assem.output_constraints, outputs, sizeof(outputs[0]) * n_outs);
        memcpy(res->attr.assem.clobbers, clobber, sizeof(clobber[0]) * n_clobber);
 
-       res = optimize_node(res);
        irn_verify_irg(res, irg);
+       res = optimize_node(res);
        return res;
 }
 
@@ -106,8 +106,8 @@ ir_node *new_rd_SymConst(dbg_info *db, ir_graph *irg, ir_mode *mode,
        res->attr.symc.kind = symkind;
        res->attr.symc.sym  = value;
 
-       res = optimize_node(res);
        irn_verify_irg(res, irg);
+       res = optimize_node(res);
        return res;
 }
 
@@ -295,7 +295,6 @@ static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
                int arity = get_irn_arity(block);
                /* no predecessors: use unknown value */
                if (arity == 0 && block == get_irg_start_block(get_irn_irg(block))) {
-                       ir_graph *irg = get_irn_irg(block);
                        if (default_initialize_local_variable != NULL) {
                                ir_node *rem = get_r_cur_block(irg);
                                set_r_cur_block(irg, block);
@@ -377,8 +376,8 @@ void mature_immBlock(ir_node *block)
           nodes refer to the unoptimized node.
           We can call optimize_in_place_2(), as global cse has no effect on blocks.
         */
-       block = optimize_in_place_2(block);
        irn_verify_irg(block, irg);
+       block = optimize_in_place_2(block);
 }
 
 ir_node *new_d_Const_long(dbg_info *db, ir_mode *mode, long value)
@@ -433,8 +432,8 @@ ir_node *new_rd_strictConv(dbg_info *dbgi, ir_node *block, ir_node * irn_op, ir_
 
        res = new_ir_node(dbgi, irg, block, op_Conv, mode, 1, in);
        res->attr.conv.strict = 1;
-       res = optimize_node(res);
        irn_verify_irg(res, irg);
+       res = optimize_node(res);
        return res;
 }
 
@@ -470,8 +469,8 @@ ir_node *new_rd_DivRL(dbg_info *dbgi, ir_node *block, ir_node * irn_mem, ir_node
        res->attr.div.resmode = resmode;
        res->attr.div.no_remainder = 1;
        res->attr.div.exc.pin_state = pin_state;
-       res = optimize_node(res);
        irn_verify_irg(res, irg);
+       res = optimize_node(res);
        return res;
 }
 
@@ -507,7 +506,6 @@ ir_node *new_rd_immBlock(dbg_info *dbgi, ir_graph *irg)
        res->attr.block.in_cg       = NULL;
        res->attr.block.cg_backedge = NULL;
        res->attr.block.extblk      = NULL;
-       res->attr.block.region      = NULL;
        res->attr.block.entity      = NULL;
 
        set_Block_block_visited(res, 0);
@@ -552,13 +550,13 @@ void add_immBlock_pred(ir_node *block, ir_node *jmp)
 
 void set_cur_block(ir_node *target)
 {
-       assert(target == NULL || current_ir_graph == get_irn_irg(target));
-       current_ir_graph->current_block = target;
+       set_r_cur_block(current_ir_graph, target);
 }
 
 void set_r_cur_block(ir_graph *irg, ir_node *target)
 {
-       assert(target == NULL || irg == get_irn_irg(target));
+       assert(target == NULL || get_irn_mode(target) == mode_BB);
+       assert(target == NULL || get_irn_irg(target)  == irg);
        irg->current_block = target;
 }
 
@@ -780,6 +778,7 @@ ir_node *new_r_Anchor(ir_graph *irg)
 {
        ir_node *in[anchor_last];
        ir_node *res;
+       size_t   i;
        memset(in, 0, sizeof(in));
        res = new_ir_node(NULL, irg, NULL, op_Anchor, mode_ANY, anchor_last, in);
        res->attr.anchor.irg.irg = irg;
@@ -788,6 +787,11 @@ ir_node *new_r_Anchor(ir_graph *irg)
         * get_Block_irg for anchor */
        res->in[0] = res;
 
+       /* we can't have NULL inputs so reference ourselfes for now */
+       for (i = 0; i < (size_t)anchor_last; ++i) {
+               set_irn_n(res, i, res);
+       }
+
        return res;
 }