X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=b1169a4802291aba8eb011e108fbb2df4efcb6cb;hb=357886575cb0becb5bd9be376fde49b57edd5385;hp=0b1f326f9c9833c6927b61df4d623e03e93f7cc4;hpb=2371a569c60ef45306308d32e2e3d43c4950f031;p=libfirm diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c index 0b1f326f9..b1169a480 100644 --- a/ir/ir/irverify.c +++ b/ir/ir/irverify.c @@ -353,8 +353,7 @@ static int verify_node_Proj_Cond(ir_node *pred, ir_node *p) ASSERT_AND_RET_DBG( ( (proj >= 0 && mode == mode_X && get_irn_mode(get_Cond_selector(pred)) == mode_b) || /* compare */ - (mode == mode_X && mode_is_int(get_irn_mode(get_Cond_selector(pred)))) || /* switch */ - is_Bad(get_Cond_selector(pred)) /* rare */ + (mode == mode_X && mode_is_int(get_irn_mode(get_Cond_selector(pred)))) /* switch */ ), "wrong Proj from Cond", 0, show_proj_failure(p); @@ -662,10 +661,6 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p) /* We don't test */ break; - case iro_Bad: - /* hmm, optimization did not remove it */ - break; - default: /* ASSERT_AND_RET(0, "Unknown opcode", 0); */ break; @@ -720,9 +715,6 @@ static int verify_node_Proj_Bound(ir_node *n, ir_node *p) ir_mode *mode = get_irn_mode(p); long proj = get_Proj_proj(p); - /* ignore Bound checks of Bad */ - if (is_Bad(get_Bound_index(n))) - return 1; ASSERT_AND_RET_DBG( ( (proj == pn_Bound_M && mode == mode_M) || @@ -765,11 +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); - ASSERT_AND_RET( - is_Bad(pred) || (get_irn_mode(pred) == mode_X), + 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)) { @@ -1437,29 +1429,21 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg) /* Phi: BB x dataM^n --> dataM */ for (i = get_Phi_n_preds(n) - 1; i >= 0; --i) { ir_node *pred = get_Phi_pred(n, i); - if (!is_Bad(pred)) { - ASSERT_AND_RET_DBG( - get_irn_mode(pred) == mymode, - "Phi node", 0, - show_phi_failure(n, pred, i); - ); - } + ASSERT_AND_RET_DBG(get_irn_mode(pred) == mymode, + "Phi node", 0, show_phi_failure(n, pred, i); + ); } ASSERT_AND_RET(mode_is_dataM(mymode) || mymode == mode_b, "Phi node", 0 ); +#if 0 if (mymode == mode_M) { for (i = get_Phi_n_preds(n) - 1; i >= 0; --i) { int j; ir_node *pred_i = get_Phi_pred(n, i); - if (is_Bad(pred_i)) - continue; for (j = i - 1; j >= 0; --j) { ir_node *pred_j = get_Phi_pred(n, j); - if (is_Bad(pred_j)) - continue; -#if 0 /* currently this checks fails for blocks with exception outputs (and these are NOT basic blocks). So it is disabled yet. */ ASSERT_AND_RET_DBG( @@ -1468,10 +1452,10 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg) 0, ir_printf("%+F and %+F of %+F are in %+F\n", pred_i, pred_j, n, get_irn_n(pred_i, -1)) ); -#endif } } } +#endif return 1; } @@ -1791,16 +1775,6 @@ int irn_verify_irg(ir_node *n, ir_graph *irg) ir_printf("node %+F", n)); } - /* We don't want to test nodes whose predecessors are Bad, - as we would have to special case that for each operation. */ - if (op != op_Phi && op != op_Block) { - int i; - for (i = get_irn_arity(n) - 1; i >= 0; --i) { - if (is_Bad(get_irn_n(n, i))) - return 1; - } - } - if (op->ops.verify_node) return op->ops.verify_node(n, irg); @@ -1852,6 +1826,7 @@ typedef struct check_cfg_env_t { pmap *branch_nodes; /**< map blocks to their branching nodes, map mode_X nodes to the blocks they branch to */ int res; + ir_nodeset_t reachable_blocks; ir_nodeset_t kept_nodes; ir_nodeset_t true_projs; ir_nodeset_t false_projs; @@ -1863,6 +1838,10 @@ static int check_block_cfg(ir_node *block, check_cfg_env_t *env) int n_cfgpreds; int i; + ASSERT_AND_RET_DBG(ir_nodeset_contains(&env->reachable_blocks, block), + "Block is not reachable by blockwalker (endless loop with no kept block?)", 0, + ir_printf("block %+F\n", block)); + n_cfgpreds = get_Block_n_cfgpreds(block); branch_nodes = env->branch_nodes; for (i = 0; i < n_cfgpreds; ++i) { @@ -1960,6 +1939,12 @@ static void assert_branch(ir_node *node, void *data) } } +static void collect_reachable_blocks(ir_node *block, void *data) +{ + ir_nodeset_t *reachable_blocks = (ir_nodeset_t*) data; + ir_nodeset_insert(reachable_blocks, block); +} + /** * Checks CFG well-formedness */ @@ -1968,9 +1953,13 @@ static int check_cfg(ir_graph *irg) check_cfg_env_t env; env.branch_nodes = pmap_create(); /**< map blocks to branch nodes */ env.res = 1; + ir_nodeset_init(&env.reachable_blocks); ir_nodeset_init(&env.true_projs); ir_nodeset_init(&env.false_projs); + irg_block_walk_graph(irg, collect_reachable_blocks, NULL, + &env.reachable_blocks); + /* note that we do not use irg_walk_block because it will miss these * invalid blocks without a jump instruction which we want to detect * here */ @@ -1991,6 +1980,7 @@ static int check_cfg(ir_graph *irg) ir_nodeset_destroy(&env.false_projs); ir_nodeset_destroy(&env.true_projs); ir_nodeset_destroy(&env.kept_nodes); + ir_nodeset_destroy(&env.reachable_blocks); pmap_destroy(env.branch_nodes); return env.res; } @@ -2010,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) @@ -2119,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"); } } @@ -2136,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"); } } @@ -2150,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"); } } @@ -2171,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"); } } @@ -2185,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"); } }