Use new scope instead of empty statement.

[libfirm] / ir / ir / irop.c

diff --git a/ir/ir/irop.c b/ir/ir/irop.c
index 67eab22..423ef45 100644 (file)
--- a/ir/ir/irop.c
+++ b/ir/ir/irop.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -26,6 +12,7 @@
 
 #include <string.h>
 
+#include "error.h"
 #include "irop_t.h"
 #include "irnode_t.h"
 #include "irhooks.h"
@@ -194,7 +181,7 @@ void (set_generic_function_ptr)(ir_op *op, op_func func)
        set_generic_function_ptr_(op, func);
 }
 
-ir_op_ops *(get_op_ops)(ir_op *op)
+ir_op_ops const *(get_op_ops)(ir_op const *const op)
 {
        return get_op_ops_(op);
 }
@@ -338,18 +325,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 Cast nodes. */
-static int node_cmp_attr_Cast(const ir_node *a, const ir_node *b)
-{
-       return get_Cast_type(a) != get_Cast_type(b);
-}
-
 /** Compares the attributes of two Load nodes. */
 static int node_cmp_attr_Load(const ir_node *a, const ir_node *b)
 {
@@ -386,11 +367,6 @@ static int node_cmp_attr_CopyB(const ir_node *a, const ir_node *b)
        return node_cmp_exception(a, b);
 }
 
-static int node_cmp_attr_Bound(const ir_node *a, const ir_node *b)
-{
-       return node_cmp_exception(a, b);
-}
-
 /** Compares the attributes of two Div nodes. */
 static int node_cmp_attr_Div(const ir_node *a, const ir_node *b)
 {
@@ -501,16 +477,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);
-       }
 }
 
 /**
@@ -532,7 +502,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));
@@ -551,7 +521,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));
 }
 
 /**
@@ -561,9 +531,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,
@@ -600,10 +571,8 @@ void firm_init_op(void)
 
        register_node_cmp_func(op_ASM,      node_cmp_attr_ASM);
        register_node_cmp_func(op_Alloc,    node_cmp_attr_Alloc);
-       register_node_cmp_func(op_Bound,    node_cmp_attr_Bound);
        register_node_cmp_func(op_Builtin,  node_cmp_attr_Builtin);
        register_node_cmp_func(op_Call,     node_cmp_attr_Call);
-       register_node_cmp_func(op_Cast,     node_cmp_attr_Cast);
        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);