X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=b1169a4802291aba8eb011e108fbb2df4efcb6cb;hb=357886575cb0becb5bd9be376fde49b57edd5385;hp=761f56cb1d0ea4cdcc31b5c14c668b664cb18fbb;hpb=27177e293d914d15fdef3798c1ce1628f83d55ef;p=libfirm

diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c
index 761f56cb1..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)
@@ -2108,7 +2109,7 @@ static void check_bads(ir_node *node, void *env)
 						fprintf(stderr, "irg_verify_bads: Block %ld has Bad predecessor\n", get_irn_node_nr(node));
 					}
 					if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-						dump_ir_graph(irg, "-assert");
+						dump_ir_graph(irg, "assert");
 						assert(0 && "Bad CF detected");
 					}
 				}
@@ -2125,7 +2126,7 @@ static void check_bads(ir_node *node, void *env)
 					fprintf(stderr, "irg_verify_bads: node %ld has Bad Block\n", get_irn_node_nr(node));
 				}
 				if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-					dump_ir_graph(irg, "-assert");
+					dump_ir_graph(irg, "assert");
 					assert(0 && "Bad CF detected");
 				}
 			}
@@ -2139,7 +2140,7 @@ static void check_bads(ir_node *node, void *env)
 					fprintf(stderr, "irg_verify_bads: node %ld is a Tuple\n", get_irn_node_nr(node));
 				}
 				if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-					dump_ir_graph(irg, "-assert");
+					dump_ir_graph(irg, "assert");
 					assert(0 && "Tuple detected");
 				}
 			}
@@ -2160,7 +2161,7 @@ static void check_bads(ir_node *node, void *env)
 							fprintf(stderr, "irg_verify_bads: Phi %ld has Bad Input\n", get_irn_node_nr(node));
 						}
 						if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-							dump_ir_graph(irg, "-assert");
+							dump_ir_graph(irg, "assert");
 							assert(0 && "Bad CF detected");
 						}
 					}
@@ -2174,7 +2175,7 @@ static void check_bads(ir_node *node, void *env)
 						fprintf(stderr, "irg_verify_bads: node %ld has Bad Input\n", get_irn_node_nr(node));
 					}
 					if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-						dump_ir_graph(irg, "-assert");
+						dump_ir_graph(irg, "assert");
 						assert(0 && "Bad NON-CF detected");
 					}
 				}