Use corresponding macro.

[libfirm] / ir / ir / irop.c

diff --git a/ir/ir/irop.c b/ir/ir/irop.c
index 450dd47..d4318f0 100644 (file)
--- a/ir/ir/irop.c
+++ b/ir/ir/irop.c
@@ -86,10 +86,11 @@ static void block_copy_attr(ir_graph *irg, const ir_node *old_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));
-       /* TODO: we should probably create a new entity. But we somehow have to
-        * patch the stuff at the same time */
-       new_node->attr.block.entity            = NULL;
-       new_node->attr.block.phis              = NULL;
+       /* It should be safe to copy the entity here, as it has no back-link to the old block.
+        * It serves just as a label number, so copying a labeled block results in an exact copy.
+        * This is at least what we need for DCE to work. */
+       new_node->attr.block.entity         = old_node->attr.block.entity;
+       new_node->attr.block.phis           = NULL;
        INIT_LIST_HEAD(&new_node->attr.block.succ_head);
 }
 
@@ -171,7 +172,7 @@ ir_op *new_ir_op(unsigned code, const char *name, op_pin_state p,
 
        firm_set_default_operations(code, &res->ops);
        firm_set_default_copy_attr(code, &res->ops);
-       firm_set_default_verifyer(code, &res->ops);
+       firm_set_default_verifier(code, &res->ops);
        firm_set_default_reassoc(code, &res->ops);
 
        add_irp_opcode(res);