diff options
Diffstat (limited to 'gcc/sel-sched.c')
| -rw-r--r-- | gcc/sel-sched.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 721013ff410..30fcfdb7ed9 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -378,10 +378,8 @@ struct moveop_static_params they are to be removed. */ int uid; -#ifdef ENABLE_CHECKING /* This is initialized to the insn on which the driver stopped its traversal. */ insn_t failed_insn; -#endif /* True if we scheduled an insn with different register. */ bool was_renamed; @@ -1655,9 +1653,8 @@ find_best_reg_for_expr (expr_t expr, blist_t bnds, bool *is_orig_reg_p) collect_unavailable_regs_from_bnds (expr, bnds, used_regs, ®_rename_data, &original_insns); -#ifdef ENABLE_CHECKING /* If after reload, make sure we're working with hard regs here. */ - if (reload_completed) + if (flag_checking && reload_completed) { reg_set_iterator rsi; unsigned i; @@ -1665,7 +1662,6 @@ find_best_reg_for_expr (expr_t expr, blist_t bnds, bool *is_orig_reg_p) EXECUTE_IF_SET_IN_REG_SET (used_regs, FIRST_PSEUDO_REGISTER, i, rsi) gcc_unreachable (); } -#endif if (EXPR_SEPARABLE_P (expr)) { @@ -3593,7 +3589,6 @@ vinsn_vec_has_expr_p (vinsn_vec_t vinsn_vec, expr_t expr) return false; } -#ifdef ENABLE_CHECKING /* Return true if either of expressions from ORIG_OPS can be blocked by previously created bookkeeping code. STATIC_PARAMS points to static parameters of move_op. */ @@ -3635,7 +3630,6 @@ av_set_could_be_blocked_by_bookkeeping_p (av_set_t orig_ops, void *static_params return false; } -#endif /* Clear VINSN_VEC and detach vinsns. */ static void @@ -4889,11 +4883,10 @@ move_cond_jump (rtx_insn *insn, bnd_t bnd) block_bnd = BLOCK_FOR_INSN (BND_TO (bnd)); prev = BND_TO (bnd); -#ifdef ENABLE_CHECKING /* Moving of jump should not cross any other jumps or beginnings of new basic blocks. The only exception is when we move a jump through mutually exclusive insns along fallthru edges. */ - if (block_from != block_bnd) + if (flag_checking && block_from != block_bnd) { bb = block_from; for (link = PREV_INSN (insn); link != PREV_INSN (prev); @@ -4908,7 +4901,6 @@ move_cond_jump (rtx_insn *insn, bnd_t bnd) } } } -#endif /* Jump is moved to the boundary. */ next = PREV_INSN (insn); @@ -6205,9 +6197,7 @@ move_op_orig_expr_not_found (insn_t insn, av_set_t orig_ops ATTRIBUTE_UNUSED, { moveop_static_params_p sparams = (moveop_static_params_p) static_params; -#ifdef ENABLE_CHECKING sparams->failed_insn = insn; -#endif /* If we're scheduling separate expr, in order to generate correct code we need to stop the search at bookkeeping code generated with the @@ -6380,7 +6370,6 @@ code_motion_process_successors (insn_t insn, av_set_t orig_ops, } } -#ifdef ENABLE_CHECKING /* Here, RES==1 if original expr was found at least for one of the successors. After the loop, RES may happen to have zero value only if at some point the expr searched is present in av_set, but is @@ -6388,12 +6377,10 @@ code_motion_process_successors (insn_t insn, av_set_t orig_ops, The exception is when the original operation is blocked by bookkeeping generated for another fence or for another path in current move_op. */ - gcc_assert (res == 1 - || (res == 0 - && av_set_could_be_blocked_by_bookkeeping_p (orig_ops, - static_params)) - || res == -1); -#endif + gcc_checking_assert (res == 1 + || (res == 0 + && av_set_could_be_blocked_by_bookkeeping_p (orig_ops, static_params)) + || res == -1); /* Merge data, clean up, etc. */ if (res != -1 && code_motion_path_driver_info->after_merge_succs) @@ -6695,9 +6682,7 @@ move_op (insn_t insn, av_set_t orig_ops, expr_t expr_vliw, sparams.dest = dest; sparams.c_expr = c_expr; sparams.uid = INSN_UID (EXPR_INSN_RTX (expr_vliw)); -#ifdef ENABLE_CHECKING sparams.failed_insn = NULL; -#endif sparams.was_renamed = false; lparams.e1 = NULL; |