From dfeec3017949474d54780fb95dbd6dfe68420313 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Thu, 3 Jul 2014 20:37:00 -0400 Subject: [PATCH 184/236] Use rtx_insn in more places in sel-sched.c gcc/ * sel-sched.c (find_place_for_bookkeeping): Strengthen local "insn" from rtx to rtx_insn *. (need_nop_to_preserve_insn_bb): Likewise for param "insn". (code_motion_path_driver): Likewise for local "last_insn". (simplify_changed_insns): Likewise for local "insn". --- gcc/sel-sched.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index bead27a..fdaad36 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -4723,7 +4723,7 @@ find_place_for_bookkeeping (edge e1, edge e2, fence_t *fence_to_rewind) removed already. */ if (DEBUG_INSN_P (place_to_insert)) { - rtx insn = sel_bb_head (book_block); + rtx_insn *insn = sel_bb_head (book_block); while (insn != place_to_insert && (DEBUG_INSN_P (insn) || NOTE_P (insn))) @@ -5967,7 +5967,7 @@ handle_emitting_transformations (rtx_insn *insn, expr_t expr, leave a NOP there till the return to fill_insns. */ static bool -need_nop_to_preserve_insn_bb (rtx insn) +need_nop_to_preserve_insn_bb (rtx_insn *insn) { insn_t bb_head, bb_end, bb_next, in_next; basic_block bb = BLOCK_FOR_INSN (insn); @@ -6645,7 +6645,7 @@ code_motion_path_driver (insn_t insn, av_set_t orig_ops, ilist_t path, if (!expr) { int res; - rtx last_insn = PREV_INSN (insn); + rtx_insn *last_insn = PREV_INSN (insn); bool added_to_path; gcc_assert (insn == sel_bb_end (bb)); @@ -7013,7 +7013,7 @@ simplify_changed_insns (void) for (i = 0; i < current_nr_blocks; i++) { basic_block bb = BASIC_BLOCK_FOR_FN (cfun, BB_TO_BLOCK (i)); - rtx insn; + rtx_insn *insn; FOR_BB_INSNS (bb, insn) if (INSN_P (insn)) -- 1.8.5.3