X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=b1169a4802291aba8eb011e108fbb2df4efcb6cb;hb=357886575cb0becb5bd9be376fde49b57edd5385;hp=53047003917ed2d35d5888f23f8acffe4f3bf8b6;hpb=05fb826eab03e6934aa46799303ede2360cd692f;p=libfirm diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c index 530470039..b1169a480 100644 --- a/ir/ir/irverify.c +++ b/ir/ir/irverify.c @@ -757,10 +757,11 @@ static int verify_node_Block(ir_node *n, ir_graph *irg) int i; for (i = get_Block_n_cfgpreds(n) - 1; i >= 0; --i) { - ir_node *pred = get_Block_cfgpred(n, i); + ir_node *pred = get_Block_cfgpred(n, i); + ir_node *skipped_pred = skip_Proj(skip_Tuple(pred)); ASSERT_AND_RET(get_irn_mode(pred) == mode_X, "Block node must have a mode_X predecessor", 0); - ASSERT_AND_RET(is_cfop(skip_Proj(skip_Tuple(pred))), "Block predecessor must be a cfop", 0); + ASSERT_AND_RET(is_cfop(skipped_pred) || is_Bad(skipped_pred), "Block predecessor must be a cfop (or Bad)", 0); } if (n == get_irg_start_block(irg)) { @@ -1999,7 +2000,7 @@ int irg_verify(ir_graph *irg, unsigned flags) last_irg_error = NULL; #endif /* NDEBUG */ - if (!check_cfg(irg)) + if (pinned && !check_cfg(irg)) res = 0; if (res == 1 && (flags & VERIFY_ENFORCE_SSA) && pinned)