X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=c093b921ccbce13e0c3e4e6eabf2bea15ff79d8a;hb=4f92e524762e0febc361676111b3b5b79addd03a;hp=5814d2d0e7b3a6cb31fcd32b1f497fa8a3f513a0;hpb=5413681e89d04862a1b7d4837049a42c0ea4230b;p=libfirm diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c index 5814d2d0e..c093b921c 100644 --- a/ir/ir/irverify.c +++ b/ir/ir/irverify.c @@ -333,7 +333,6 @@ static int verify_node_Proj_Start(ir_node *n, ir_node *p) (proj == pn_Start_X_initial_exec && mode == mode_X) || (proj == pn_Start_M && mode == mode_M) || (proj == pn_Start_P_frame_base && mode_is_reference(mode)) || - (proj == pn_Start_P_tls && mode_is_reference(mode)) || (proj == pn_Start_T_args && mode == mode_T) ), "wrong Proj from Start", 0, @@ -414,8 +413,7 @@ static int verify_node_Proj_Call(ir_node *n, ir_node *p) (proj == pn_Call_M && mode == mode_M) || (proj == pn_Call_X_regular && mode == mode_X) || (proj == pn_Call_X_except && mode == mode_X) || - (proj == pn_Call_T_result && mode == mode_T) || - (proj == pn_Call_P_value_res_base && mode_is_reference(mode)) + (proj == pn_Call_T_result && mode == mode_T) ), "wrong Proj from Call", 0, show_proj_failure(p); @@ -1848,21 +1846,21 @@ int irg_verify(ir_graph *irg, unsigned flags) { int res = 1; #ifdef DEBUG_libfirm + int pinned = get_irg_pinned(irg) == op_pin_state_pinned; #ifndef NDEBUG - last_irg_error = NULL; + last_irg_error = NULL; #endif /* NDEBUG */ - assert(get_irg_pinned(irg) == op_pin_state_pinned && "Verification need pinned graph"); - - if (flags & VERIFY_ENFORCE_SSA) + if ((flags & VERIFY_ENFORCE_SSA) && pinned) compute_doms(irg); irg_walk_anchors( irg, - get_irg_dom_state(irg) == dom_consistent && - get_irg_pinned(irg) == op_pin_state_pinned ? verify_wrap_ssa : verify_wrap, - NULL, &res + pinned && get_irg_dom_state(irg) == dom_consistent + ? verify_wrap_ssa : verify_wrap, + NULL, + &res ); if (get_node_verification_mode() == FIRM_VERIFICATION_REPORT && ! res) { @@ -2053,7 +2051,7 @@ int irg_verify_bads(ir_graph *irg, int flags) /* * set the default verify operation */ -void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops) +void firm_set_default_verifier(unsigned code, ir_op_ops *ops) { #define CASE(a) \ case iro_##a: \