irgraph: Use get_irg_obstack() instead of accessing irg->obst directly.

[libfirm] / ir / ir / irop.c

diff --git a/ir/ir/irop.c b/ir/ir/irop.c
index 89235ff..f11728a 100644 (file)
--- a/ir/ir/irop.c
+++ b/ir/ir/irop.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 
+#include "error.h"
 #include "irop_t.h"
 #include "irnode_t.h"
 #include "irhooks.h"
@@ -112,8 +113,11 @@ void ir_clear_opcodes_generic_func(void)
 
        for (i = 0; i < n; ++i) {
                ir_op *op = ir_get_opcode(i);
-               if (op != NULL)
-                       op->ops.generic = (op_func)NULL;
+               if (op == NULL)
+                       continue;
+               op->ops.generic  = (op_func)NULL;
+               op->ops.generic1 = (op_func)NULL;
+               op->ops.generic2 = (op_func)NULL;
        }
 }
 
@@ -335,18 +339,12 @@ static int node_cmp_attr_Phi(const ir_node *a, const ir_node *b)
        (void) b;
        /* do not CSE Phi-nodes without any inputs when building new graphs */
        if (get_irn_arity(a) == 0 &&
-           get_irg_phase_state(get_irn_irg(a)) == phase_building) {
+               irg_is_constrained(get_irn_irg(a), IR_GRAPH_CONSTRAINT_CONSTRUCTION)) {
            return 1;
        }
        return 0;
 }
 
-/** Compares the attributes of two Conv nodes. */
-static int node_cmp_attr_Conv(const ir_node *a, const ir_node *b)
-{
-       return get_Conv_strict(a) != get_Conv_strict(b);
-}
-
 /** Compares the attributes of two Cast nodes. */
 static int node_cmp_attr_Cast(const ir_node *a, const ir_node *b)
 {
@@ -504,16 +502,10 @@ static int node_cmp_attr_InstOf(const ir_node *a, const ir_node *b)
 static void default_copy_attr(ir_graph *irg, const ir_node *old_node,
                               ir_node *new_node)
 {
-       unsigned size = firm_add_node_size;
        (void) irg;
 
        assert(get_irn_op(old_node) == get_irn_op(new_node));
        memcpy(&new_node->attr, &old_node->attr, get_op_attr_size(get_irn_op(old_node)));
-
-       if (size > 0) {
-               /* copy additional node data */
-               memcpy(get_irn_data(new_node, void, size), get_irn_data(old_node, void, size), size);
-       }
 }
 
 /**
@@ -535,7 +527,7 @@ static void block_copy_attr(ir_graph *irg, const ir_node *old_node,
        default_copy_attr(irg, old_node, new_node);
        new_node->attr.block.irg.irg       = irg;
        new_node->attr.block.phis          = NULL;
-       new_node->attr.block.backedge      = new_backedge_arr(irg->obst, get_irn_arity(new_node));
+       new_node->attr.block.backedge      = new_backedge_arr(get_irg_obstack(irg), get_irn_arity(new_node));
        new_node->attr.block.block_visited = 0;
        memset(&new_node->attr.block.dom, 0, sizeof(new_node->attr.block.dom));
        memset(&new_node->attr.block.pdom, 0, sizeof(new_node->attr.block.pdom));
@@ -554,7 +546,7 @@ static void phi_copy_attr(ir_graph *irg, const ir_node *old_node,
 {
        default_copy_attr(irg, old_node, new_node);
        new_node->attr.phi.next       = NULL;
-       new_node->attr.phi.u.backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node));
+       new_node->attr.phi.u.backedge = new_backedge_arr(get_irg_obstack(irg), get_irn_arity(new_node));
 }
 
 /**
@@ -564,9 +556,10 @@ static void ASM_copy_attr(ir_graph *irg, const ir_node *old_node,
                           ir_node *new_node)
 {
        default_copy_attr(irg, old_node, new_node);
-       new_node->attr.assem.input_constraints  = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.input_constraints);
-       new_node->attr.assem.output_constraints = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.output_constraints);
-       new_node->attr.assem.clobbers = DUP_ARR_D(ident*, irg->obst, old_node->attr.assem.clobbers);
+       struct obstack *const obst = get_irg_obstack(irg);
+       new_node->attr.assem.input_constraints  = DUP_ARR_D(ir_asm_constraint, obst, old_node->attr.assem.input_constraints);
+       new_node->attr.assem.output_constraints = DUP_ARR_D(ir_asm_constraint, obst, old_node->attr.assem.output_constraints);
+       new_node->attr.assem.clobbers           = DUP_ARR_D(ident*,            obst, old_node->attr.assem.clobbers);
 }
 
 static void switch_copy_attr(ir_graph *irg, const ir_node *old_node,
@@ -610,7 +603,6 @@ void firm_init_op(void)
        register_node_cmp_func(op_Cmp,      node_cmp_attr_Cmp);
        register_node_cmp_func(op_Confirm,  node_cmp_attr_Confirm);
        register_node_cmp_func(op_Const,    node_cmp_attr_Const);
-       register_node_cmp_func(op_Conv,     node_cmp_attr_Conv);
        register_node_cmp_func(op_CopyB,    node_cmp_attr_CopyB);
        register_node_cmp_func(op_Div,      node_cmp_attr_Div);
        register_node_cmp_func(op_Dummy,    node_cmp_attr_Dummy);
@@ -620,14 +612,6 @@ void firm_init_op(void)
        register_node_cmp_func(op_Mod,      node_cmp_attr_Mod);
        register_node_cmp_func(op_Phi,      node_cmp_attr_Phi);
        register_node_cmp_func(op_Proj,     node_cmp_attr_Proj);
-       register_node_cmp_func(op_Div,      node_cmp_attr_Div);
-       register_node_cmp_func(op_Dummy,    node_cmp_attr_Dummy);
-       register_node_cmp_func(op_Free,     node_cmp_attr_Free);
-       register_node_cmp_func(op_InstOf,   node_cmp_attr_InstOf);
-       register_node_cmp_func(op_Load,     node_cmp_attr_Load);
-       register_node_cmp_func(op_Mod,      node_cmp_attr_Mod);
-       register_node_cmp_func(op_Phi,      node_cmp_attr_Phi);
-       register_node_cmp_func(op_Proj,     node_cmp_attr_Proj);
        register_node_cmp_func(op_Sel,      node_cmp_attr_Sel);
        register_node_cmp_func(op_Store,    node_cmp_attr_Store);
        register_node_cmp_func(op_SymConst, node_cmp_attr_SymConst);