Add assertions if set_cur_block() is tried for a block on a wrong irg.

[libfirm] / ir / opt / opt_polymorphy.c

diff --git a/ir/opt/opt_polymorphy.c b/ir/opt/opt_polymorphy.c
index fd5c953..773b89d 100644 (file)
--- a/ir/opt/opt_polymorphy.c
+++ b/ir/opt/opt_polymorphy.c
@@ -81,7 +81,7 @@ static ir_type *get_dynamic_type(ir_node *ptr)
 
        /* skip Cast and Confirm nodes */
        for (;;) {
-               ir_opcode code = get_irn_opcode(ptr);
+               unsigned code = get_irn_opcode(ptr);
 
                switch (code) {
                case iro_Cast:
@@ -127,7 +127,7 @@ ir_node *transform_node_Sel(ir_node *node)
 
        if (get_irp_phase_state() == phase_building) return node;
 
-       if (!(get_opt_optimize() && get_opt_dyn_meth_dispatch()))
+       if (!get_opt_dyn_meth_dispatch())
                return node;
 
        if (!is_Method_type(get_entity_type(ent)))
@@ -142,10 +142,7 @@ ir_node *transform_node_Sel(ir_node *node)
                        /* We could remove the Call depending on this Sel. */
                        new_node = node;
                } else {
-                       ir_node *rem_block = get_cur_block();
-                       set_cur_block(get_nodes_block(node));
-                       new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(ent));
-                       set_cur_block(rem_block);
+                       new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(ent), get_nodes_block(node));
                        DBG_OPT_POLY(node, new_node);
                }
                return new_node;
@@ -157,15 +154,11 @@ ir_node *transform_node_Sel(ir_node *node)
 
        if (dyn_tp != firm_unknown_type) {
                ir_entity *called_ent;
-               ir_node *rem_block;
 
                /* We know which method will be called, no dispatch necessary. */
                called_ent = resolve_ent_polymorphy(dyn_tp, ent);
 
-               rem_block = get_cur_block();
-               set_cur_block(get_nodes_block(node));
-               new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(called_ent));
-               set_cur_block(rem_block);
+               new_node = copy_const_value(get_irn_dbg_info(node), get_atomic_ent_value(called_ent), get_nodes_block(node));
                DBG_OPT_POLY(node, new_node);
 
                return new_node;
@@ -189,7 +182,7 @@ ir_node *transform_polymorph_Load(ir_node *load)
        ir_entity *ent;
        ir_type *dyn_tp;
 
-       if (!(get_opt_optimize() && get_opt_dyn_meth_dispatch()))
+       if (!get_opt_dyn_meth_dispatch())
                return load;
 
        field_ptr = get_Load_ptr(load);