Enqueue Phi nodes to reach fixpoint.

[libfirm] / ir / ir / irverify.c

diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c
index b3ded8c..132e20d 100644 (file)
--- a/ir/ir/irverify.c
+++ b/ir/ir/irverify.c
@@ -1392,13 +1392,10 @@ static int verify_node_Rotl(const ir_node *n)
  */
 static int verify_node_Conv(const ir_node *n)
 {
-       ir_graph *irg     = get_irn_irg(n);
-       ir_mode  *mymode  = get_irn_mode(n);
-       ir_mode  *op1mode = get_irn_mode(get_Conv_op(n));
+       ir_mode *mymode  = get_irn_mode(n);
+       ir_mode *op1mode = get_irn_mode(get_Conv_op(n));
 
-       ASSERT_AND_RET_DBG(
-               is_irg_state(irg, IR_GRAPH_STATE_BCONV_ALLOWED) ||
-               (mode_is_datab(op1mode) && mode_is_data(mymode)),
+       ASSERT_AND_RET_DBG(mode_is_datab(op1mode) && mode_is_data(mymode),
                "Conv node", 0,
                show_unop_failure(n, "/* Conv: BB x datab --> data */");
        );
@@ -1550,7 +1547,7 @@ static int verify_node_Free(const ir_node *n)
        ir_mode *mymode  = get_irn_mode(n);
        ir_mode *op1mode = get_irn_mode(get_Free_mem(n));
        ir_mode *op2mode = get_irn_mode(get_Free_ptr(n));
-       ir_mode *op3mode = get_irn_mode(get_Free_size(n));
+       ir_mode *op3mode = get_irn_mode(get_Free_count(n));
 
        ASSERT_AND_RET_DBG(
                /* Free: BB x M x ref x int_u --> M */
@@ -1763,7 +1760,7 @@ int irn_verify_irg(const ir_node *n, ir_graph *irg)
                        ir_printf("node %+F", n);
                );
        } else if (!is_Block(n) && is_irn_pinned_in_irg(n)
-                  && !is_irg_state(irg, IR_GRAPH_STATE_BAD_BLOCK)) {
+                  && is_irg_state(irg, IR_GRAPH_STATE_NO_BADS)) {
                ASSERT_AND_RET_DBG(is_Block(get_nodes_block(n)) || is_Anchor(n),
                                "block input is not a block", 0,
                                ir_printf("node %+F", n);
@@ -2010,7 +2007,7 @@ int irg_verify(ir_graph *irg, unsigned flags)
 
        irg_walk_anchors(
                irg,
-               pinned && get_irg_dom_state(irg) == dom_consistent
+               pinned && is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE)
                        ? verify_wrap_ssa : verify_wrap,
                NULL,
                &res
@@ -2075,7 +2072,7 @@ int irn_verify_irg_dump(const ir_node *n, ir_graph *irg,
        firm_verify_failure_msg = NULL;
        do_node_verification(FIRM_VERIFICATION_ERROR_ONLY);
        res = irn_verify_irg(n, irg);
-       if (res && get_irg_dom_state(irg) == dom_consistent &&
+       if (res && is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE) &&
            get_irg_pinned(irg) == op_pin_state_pinned)
                res = check_dominance_for_node(n);
        do_node_verification(old);