https://gcc.gnu.org/g:2df90e844e1ad833ac336ccedd4c30472b22f345

commit r17-5846-g2df90e844e1ad833ac336ccedd4c30472b22f345
Author: Trevor Saunders <[email protected]>
Date:   Sat Oct 24 07:44:58 2026 +0000

    Use rtx_insn * for locals that already hold an insn
    
    gcc/ChangeLog:
    
            * config/aarch64/aarch64.cc (aarch64_pushwb_single_reg, 
aarch64_expand_epilogue):
            Use rtx_insn * for locals that already hold an insn.
            * config/alpha/alpha.cc (alpha_expand_prologue, 
alpha_expand_epilogue): Likewise.
            * config/arc/arc.cc (arc_dwarf_emit_irq_save_regs, push_reg, 
pop_reg, arc_expand_epilogue,
            hwloop_fail): Likewise.
            * config/arm/arm.cc (cmse_clear_registers, arm_emit_call_insn, 
thumb2_emit_strd_push,
            thumb_set_frame_pointer): Likewise.
            * config/bfin/bfin.cc (hwloop_optimize, hwloop_fail): Likewise.
            * config/c6x/c6x.cc (reorg_emit_nops): Likewise.
            * config/cris/cris.cc (cris_split_movdx, cris_expand_epilogue,
            cris_emit_movem_store): Likewise.
            * config/cris/cris.md (movdi): Likewise.
            * config/csky/csky.cc (get_csky_barrier_cost, 
csky_expand_prologue): Likewise.
            * config/fr30/fr30.cc (fr30_expand_prologue, fr30_move_double): 
Likewise.
            * config/frv/frv.cc (frv_frame_insn, frv_split_scc, 
frv_split_cond_move, frv_split_minmax,
            frv_split_abs): Likewise.
            * config/ft32/ft32.cc (ft32_expand_prologue): Likewise.
            * config/gcn/gcn.cc (move_callee_saved_registers, 
gcn_expand_prologue): Likewise.
            * config/ia64/ia64.cc (ia64_split_tmode_move): Likewise.
            * config/lm32/lm32.cc (emit_add): Likewise.
            * config/loongarch/loongarch.cc (loongarch_set_frame_expr,
            loongarch_expand_epilogue): Likewise.
            * config/loongarch/loongarch.md (sibcall, sibcall_value): Likewise.
            * config/m32r/m32r.cc (gen_split_move_double, pop): Likewise.
            * config/mmix/mmix.cc (mmix_expand_prologue, mmix_emit_sp_add): 
Likewise.
            * config/moxie/moxie.cc (moxie_expand_prologue): Likewise.
            * config/nds32/nds32-md-auxiliary.cc 
(nds32_emit_push_fpr_callee_saved,
            nds32_emit_pop_fpr_callee_saved, nds32_emit_v3pop_fpr_callee_saved,
            nds32_legitimize_tls_address): Likewise.
            * config/nds32/nds32.cc (nds32_expand_epilogue): Likewise.
            * config/nds32/nds32.md (call, call_value): Likewise.
            * config/nvptx/nvptx.cc (nvptx_propagate): Likewise.
            * config/or1k/or1k.cc (or1k_save_reg, or1k_expand_prologue, 
or1k_expand_epilogue): Likewise.
            * config/pru/pru.cc (pru_add3_frame_adjust): Likewise.
            * config/pru/pru.md (insv<mode>, lshrdi3, ashldi3): Likewise.
            * config/riscv/riscv.cc (riscv_set_frame_expr, 
riscv_for_each_saved_v_reg,
            riscv_gen_multi_pop_insn, riscv_expand_epilogue): Likewise.
            * config/riscv/thead.cc (th_mempair_save_regs, 
th_mempair_restore_regs): Likewise.
            * config/rs6000/rs6000-logue.cc (rs6000_emit_prologue, 
restore_saved_cr): Likewise.
            * config/rs6000/rs6000-string.cc (expand_block_compare_gpr, 
expand_strncmp_gpr_sequence,
            expand_strn_compare): Likewise.
            * config/rx/rx.cc (gen_safe_add, push_regs): Likewise.
            * config/s390/s390.cc (save_fpr): Likewise.
            * config/sh/sh.cc (sh_reorg): Likewise.
            * config/sh/sh_treg_combine.cc (trace_reg_uses_1): Likewise.
            * config/sparc/sparc.cc (empty_delay_slot, sparc_output_mi_thunk): 
Likewise.
            * config/stormy16/stormy16.cc (xstormy16_split_move, 
emit_addhi3_postreload): Likewise.
            * config/v850/v850.cc (expand_prologue, expand_epilogue): Likewise.
            * config/vax/vax.cc (vax_expand_prologue): Likewise.
            * config/visium/visium.cc (empty_delay_slot): Likewise.
            * config/xtensa/xtensa.cc (xtensa_copy_incoming_a7, 
xtensa_set_return_address): Likewise.
            * final.cc (shorten_branches): Likewise.
            * reorg.cc (try_merge_delay_insns, fill_slots_from_thread, 
make_return_insns): Likewise.
            * tree-outof-ssa.cc (insert_value_copy_on_edge): Likewise.

Diff:
---
 gcc/config/aarch64/aarch64.cc          |  6 +++---
 gcc/config/alpha/alpha.cc              |  5 +++--
 gcc/config/arc/arc.cc                  | 11 ++++++-----
 gcc/config/arm/arm.cc                  | 17 ++++++++---------
 gcc/config/bfin/bfin.cc                |  9 +++++----
 gcc/config/c6x/c6x.cc                  |  6 +++---
 gcc/config/cris/cris.cc                | 29 ++++++++++++-----------------
 gcc/config/cris/cris.md                |  3 +--
 gcc/config/csky/csky.cc                |  7 ++++---
 gcc/config/fr30/fr30.cc                |  5 ++---
 gcc/config/frv/frv.cc                  | 10 +++++-----
 gcc/config/ft32/ft32.cc                |  2 +-
 gcc/config/gcn/gcn.cc                  | 23 +++++++++++++----------
 gcc/config/ia64/ia64.cc                |  3 ++-
 gcc/config/lm32/lm32.cc                |  2 +-
 gcc/config/loongarch/loongarch.cc      |  6 ++----
 gcc/config/loongarch/loongarch.md      | 12 +++++++-----
 gcc/config/m32r/m32r.cc                |  8 +++-----
 gcc/config/mmix/mmix.cc                |  8 ++++----
 gcc/config/moxie/moxie.cc              |  2 +-
 gcc/config/nds32/nds32-md-auxiliary.cc |  9 +++++----
 gcc/config/nds32/nds32.cc              |  2 +-
 gcc/config/nds32/nds32.md              |  4 ++--
 gcc/config/nvptx/nvptx.cc              |  2 +-
 gcc/config/or1k/or1k.cc                |  7 ++++---
 gcc/config/pru/pru.cc                  |  2 +-
 gcc/config/pru/pru.md                  | 25 +++++++++++--------------
 gcc/config/riscv/riscv.cc              | 14 ++++++--------
 gcc/config/riscv/thead.cc              |  6 ++++--
 gcc/config/rs6000/rs6000-logue.cc      |  9 +++++----
 gcc/config/rs6000/rs6000-string.cc     |  8 ++++----
 gcc/config/rx/rx.cc                    |  4 ++--
 gcc/config/s390/s390.cc                |  2 +-
 gcc/config/sh/sh.cc                    |  5 +++--
 gcc/config/sh/sh_treg_combine.cc       |  2 +-
 gcc/config/sparc/sparc.cc              |  6 +++---
 gcc/config/stormy16/stormy16.cc        |  7 ++++---
 gcc/config/v850/v850.cc                |  5 ++---
 gcc/config/vax/vax.cc                  |  2 +-
 gcc/config/visium/visium.cc            |  3 +--
 gcc/config/xtensa/xtensa.cc            |  4 ++--
 gcc/final.cc                           |  3 ++-
 gcc/reorg.cc                           |  8 +++++---
 gcc/tree-outof-ssa.cc                  |  4 ++--
 44 files changed, 159 insertions(+), 158 deletions(-)

diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index b3ab80050dd1..6936ab79974c 100644
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -9410,14 +9410,14 @@ aarch64_pushwb_single_reg (machine_mode mode, unsigned 
regno,
                           HOST_WIDE_INT adjustment)
  {
   rtx base_rtx = stack_pointer_rtx;
-  rtx insn, reg, mem;
+  rtx reg, mem;
 
   reg = gen_rtx_REG (mode, regno);
   mem = gen_rtx_PRE_MODIFY (Pmode, base_rtx,
                            plus_constant (Pmode, base_rtx, -adjustment));
   mem = gen_frame_mem (mode, mem);
 
-  insn = emit_move_insn (mem, reg);
+  rtx_insn *insn = emit_move_insn (mem, reg);
   RTX_FRAME_RELATED_P (insn) = 1;
 }
 
@@ -11255,7 +11255,7 @@ aarch64_expand_epilogue (rtx_call_insn *sibcall)
       rtx_code_label *label = gen_label_rtx ();
       rtx x = aarch64_gen_compare_zero_and_branch (EQ, EH_RETURN_TAKEN_RTX,
                                                   label);
-      rtx jump = emit_jump_insn (x);
+      rtx_insn *jump = emit_jump_insn (x);
       JUMP_LABEL (jump) = label;
       LABEL_NUSES (label)++;
       emit_insn (gen_add2_insn (stack_pointer_rtx,
diff --git a/gcc/config/alpha/alpha.cc b/gcc/config/alpha/alpha.cc
index 6c9087910afd..cc2b1fe95e77 100644
--- a/gcc/config/alpha/alpha.cc
+++ b/gcc/config/alpha/alpha.cc
@@ -8613,7 +8613,7 @@ alpha_expand_prologue (void)
       HOST_WIDE_INT leftover = probed_size + 4096 - blocks * 8192;
       rtx ptr = gen_rtx_REG (DImode, 22);
       rtx count = gen_rtx_REG (DImode, 23);
-      rtx seq;
+      rtx_insn *seq;
 
       emit_move_insn (count, GEN_INT (blocks));
       emit_insn (gen_adddi3 (ptr, stack_pointer_rtx, GEN_INT (4096)));
@@ -8963,7 +8963,8 @@ alpha_expand_epilogue (void)
   HOST_WIDE_INT reg_offset;
   int fp_is_frame_pointer, fp_offset;
   rtx sa_reg, sa_reg_exp = NULL;
-  rtx sp_adj1, sp_adj2, mem, reg, insn;
+  rtx sp_adj1, sp_adj2, mem, reg;
+  rtx_insn *insn;
   rtx eh_ofs;
   rtx cfa_restores = NULL_RTX;
 
diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc
index 1cf2f5fa873c..14abb4d48535 100644
--- a/gcc/config/arc/arc.cc
+++ b/gcc/config/arc/arc.cc
@@ -2907,7 +2907,8 @@ arc_compute_frame_size (void)
 static void
 arc_dwarf_emit_irq_save_regs (void)
 {
-  rtx tmp, par, insn, reg;
+  rtx tmp, par, reg;
+  rtx_insn *insn;
   int i, offset, j;
 
   par = gen_rtx_SEQUENCE (VOIDmode,
@@ -3004,7 +3005,7 @@ push_reg (rtx reg)
 {
   rtx stkslot = gen_rtx_MEM (GET_MODE (reg), gen_rtx_PRE_DEC (Pmode,
                                                   stack_pointer_rtx));
-  rtx insn = emit_move_insn (stkslot, reg);
+  rtx_insn *insn = emit_move_insn (stkslot, reg);
   RTX_FRAME_RELATED_P (insn) = 1;
   add_reg_note (insn, REG_CFA_ADJUST_CFA,
                gen_rtx_SET (stack_pointer_rtx,
@@ -3058,7 +3059,7 @@ pop_reg (rtx reg)
 {
   rtx stkslot = gen_rtx_MEM (GET_MODE (reg), gen_rtx_POST_INC (Pmode,
                                                   stack_pointer_rtx));
-  rtx insn = emit_move_insn (reg, stkslot);
+  rtx_insn *insn = emit_move_insn (reg, stkslot);
   RTX_FRAME_RELATED_P (insn) = 1;
   add_reg_note (insn, REG_CFA_ADJUST_CFA,
                gen_rtx_SET (stack_pointer_rtx,
@@ -3933,7 +3934,7 @@ arc_expand_epilogue (int sibcall_p)
   /* Restore accumulator registers.  */
   if (arc_must_save_register (R58_REG, cfun, true))
     {
-      rtx insn;
+      rtx_insn *insn;
       rtx reg0 = gen_rtx_REG (SImode, R0_REG);
       rtx reg1 = gen_rtx_REG (SImode, R1_REG);
       size_to_deallocate -= pop_reg (reg0);
@@ -7935,7 +7936,7 @@ static void
 hwloop_fail (hwloop_info loop)
 {
   rtx test;
-  rtx insn = loop->loop_end;
+  rtx_insn *insn = loop->loop_end;
 
   if (TARGET_DBNZ
       && (loop->length && (loop->length <= ARC_MAX_LOOP_LENGTH))
diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc
index 454ba690cff9..47ad430c2771 100644
--- a/gcc/config/arm/arm.cc
+++ b/gcc/config/arm/arm.cc
@@ -18092,7 +18092,8 @@ cmse_clear_registers (sbitmap to_clear_bitmap, uint32_t 
*padding_bits_to_clear,
     {
       rtvec vunspec_vec;
       int i, j, k, nb_regs;
-      rtx use_seq, par, reg, set, vunspec;
+      rtx_insn *use_seq;
+      rtx par, reg, set, vunspec;
       int to_clear_bitmap_size = SBITMAP_SIZE (to_clear_bitmap);
       auto_sbitmap core_regs_bitmap (to_clear_bitmap_size);
       auto_sbitmap to_clear_core_bitmap (to_clear_bitmap_size);
@@ -19044,9 +19045,7 @@ detect_cmse_nonsecure_call (tree addr)
 void
 arm_emit_call_insn (rtx pat, rtx addr, bool sibcall)
 {
-  rtx insn;
-
-  insn = emit_call_insn (pat);
+  rtx_insn *insn = emit_call_insn (pat);
 
   /* The PIC register is live on entry to VxWorks PIC PLT entries.
      If the call might use such an entry, add a use of the PIC register
@@ -21084,7 +21083,7 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask)
      64-bit aligned).  */
   if ((num_regs & 1) != 0)
     {
-      rtx reg, mem, insn;
+      rtx reg, mem;
 
       reg = gen_rtx_REG (SImode, regno);
       if (num_regs == 1)
@@ -21099,7 +21098,7 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask)
 
       tmp = gen_rtx_SET (mem, reg);
       RTX_FRAME_RELATED_P (tmp) = 1;
-      insn = emit_insn (tmp);
+      rtx_insn *insn = emit_insn (tmp);
       RTX_FRAME_RELATED_P (insn) = 1;
       add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf);
       tmp = gen_rtx_SET (gen_frame_mem (Pmode, stack_pointer_rtx), reg);
@@ -21127,7 +21126,6 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask)
 
        if (first)
          {
-           rtx insn;
 
            first = false;
            mem1 = gen_frame_mem (Pmode, plus_constant (Pmode,
@@ -21148,7 +21146,7 @@ thumb2_emit_strd_push (unsigned long saved_regs_mask)
            XVECEXP (par, 0, 0) = tmp0;
            XVECEXP (par, 0, 1) = tmp1;
            XVECEXP (par, 0, 2) = tmp2;
-           insn = emit_insn (par);
+           rtx_insn *insn = emit_insn (par);
            RTX_FRAME_RELATED_P (insn) = 1;
            add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf);
          }
@@ -22383,7 +22381,8 @@ static void
 thumb_set_frame_pointer (arm_stack_offsets *offsets)
 {
   HOST_WIDE_INT amount;
-  rtx insn, dwarf;
+  rtx_insn *insn;
+  rtx dwarf;
 
   amount = offsets->outgoing_args - offsets->locals_base;
   if (amount < 1024)
diff --git a/gcc/config/bfin/bfin.cc b/gcc/config/bfin/bfin.cc
index e52df8b3ae15..81fa48eacdec 100644
--- a/gcc/config/bfin/bfin.cc
+++ b/gcc/config/bfin/bfin.cc
@@ -3456,7 +3456,7 @@ hwloop_optimize (hwloop_info loop)
   rtx iter_reg, scratchreg, scratch_init;
   rtx_insn *scratch_init_insn;
   rtx lc_reg, lt_reg, lb_reg;
-  rtx seq_end;
+  rtx_insn *seq_end;
   rtx_insn *seq;
   int length;
   bool clobber0, clobber1;
@@ -3853,13 +3853,14 @@ hwloop_optimize (hwloop_info loop)
 static void
 hwloop_fail (hwloop_info loop)
 {
-  rtx insn = loop->loop_end;
+  rtx_insn *insn = loop->loop_end;
 
   if (DPREG_P (loop->iter_reg))
     {
       /* If loop->iter_reg is a DREG or PREG, we can split it here
         without scratch register.  */
-      rtx insn, test;
+      rtx_insn *insn;
+      rtx test;
 
       emit_insn_before (gen_addsi3 (loop->iter_reg,
                                    loop->iter_reg,
@@ -3879,7 +3880,7 @@ hwloop_fail (hwloop_info loop)
   else
     {
       splitting_loops = 1;
-      try_split (PATTERN (insn), safe_as_a <rtx_insn *> (insn), 1);
+      try_split (PATTERN (insn), insn, 1);
       splitting_loops = 0;
     }
 }
diff --git a/gcc/config/c6x/c6x.cc b/gcc/config/c6x/c6x.cc
index 87279475e91e..6eae45d7d126 100644
--- a/gcc/config/c6x/c6x.cc
+++ b/gcc/config/c6x/c6x.cc
@@ -4989,7 +4989,7 @@ static void
 reorg_emit_nops (rtx_code_label **call_labels)
 {
   bool first;
-  rtx last_call;
+  rtx_insn *last_call;
   rtx_insn *prev;
   int prev_clock, earliest_bb_end;
   int prev_implicit_nops;
@@ -5054,7 +5054,7 @@ reorg_emit_nops (rtx_code_label **call_labels)
                  && insn_get_clock (last_call) + 6 <= this_clock)
                {
                  emit_label_before (call_labels[INSN_UID (last_call)], insn);
-                 last_call = NULL_RTX;
+                 last_call = nullptr;
                }
              prev_implicit_nops = 0;
            }
@@ -5106,7 +5106,7 @@ reorg_emit_nops (rtx_code_label **call_labels)
 
          if (last_call)
            emit_label_after (call_labels[INSN_UID (last_call)], prev);
-         last_call = NULL_RTX;
+         last_call = nullptr;
        }
       insn = next;
     }
diff --git a/gcc/config/cris/cris.cc b/gcc/config/cris/cris.cc
index f3f32fd05838..af664087c015 100644
--- a/gcc/config/cris/cris.cc
+++ b/gcc/config/cris/cris.cc
@@ -2546,7 +2546,7 @@ cris_split_movdx (rtx *operands)
   machine_mode mode = GET_MODE (operands[0]);
   rtx dest = operands[0];
   rtx src  = operands[1];
-  rtx val;
+  rtx_insn *val;
 
   /* We used to have to handle (SUBREG (MEM)) here, but that should no
      longer happen; after reload there are no SUBREGs any more, and we're
@@ -2602,14 +2602,14 @@ cris_split_movdx (rtx *operands)
           if (GET_CODE (addr) == POST_INC)
            {
              rtx mem;
-             rtx insn;
 
              /* Whenever we emit insns with post-incremented
                 addresses ourselves, we must add a post-inc note
                 manually.  */
              mem = change_address (src, SImode, addr);
-             insn = emit_move_insn (operand_subword (dest, 0, TRUE, mode),
-                                    mem);
+             rtx_insn *insn
+               = emit_move_insn (operand_subword (dest, 0, TRUE, mode),
+                                 mem);
              if (GET_CODE (XEXP (mem, 0)) == POST_INC)
                REG_NOTES (insn)
                  = alloc_EXPR_LIST (REG_INC, XEXP (XEXP (mem, 0), 0),
@@ -2658,12 +2658,12 @@ cris_split_movdx (rtx *operands)
       if (GET_CODE (addr) == POST_INC)
        {
          rtx mem;
-         rtx insn;
 
          /* Whenever we emit insns with post-incremented addresses
             ourselves, we must add a post-inc note manually.  */
          mem = change_address (dest, SImode, addr);
-         insn = emit_move_insn (mem, operand_subword (src, 0, TRUE, mode));
+         rtx_insn *insn
+           = emit_move_insn (mem, operand_subword (src, 0, TRUE, mode));
          if (GET_CODE (XEXP (mem, 0)) == POST_INC)
            REG_NOTES (insn)
              = alloc_EXPR_LIST (REG_INC, XEXP (XEXP (mem, 0), 0),
@@ -3162,7 +3162,6 @@ cris_expand_epilogue (void)
        regno--)
     if (cris_reg_saved_in_regsave_area (regno))
       {
-       rtx insn;
 
        if (argspace_offset)
          {
@@ -3177,7 +3176,7 @@ cris_expand_epilogue (void)
        mem = gen_rtx_MEM (SImode, gen_rtx_POST_INC (SImode,
                                                     stack_pointer_rtx));
        set_mem_alias_set (mem, get_frame_alias_set ());
-       insn = emit_move_insn (gen_raw_REG (SImode, regno), mem);
+       rtx_insn *insn = emit_move_insn (gen_raw_REG (SImode, regno), mem);
 
        /* Whenever we emit insns with post-incremented addresses
           ourselves, we must add a post-inc note manually.  */
@@ -3188,7 +3187,6 @@ cris_expand_epilogue (void)
   /* If we have any movem-restore, do it now.  */
   if (last_movem_reg != -1)
     {
-      rtx insn;
 
       if (argspace_offset)
        {
@@ -3199,7 +3197,7 @@ cris_expand_epilogue (void)
       mem = gen_rtx_MEM (SImode,
                         gen_rtx_POST_INC (SImode, stack_pointer_rtx));
       set_mem_alias_set (mem, get_frame_alias_set ());
-      insn
+      rtx_insn *insn
        = emit_insn (cris_gen_movem_load (mem, GEN_INT (last_movem_reg + 1)));
       /* Whenever we emit insns with post-incremented addresses
         ourselves, we must add a post-inc note manually.  */
@@ -3221,7 +3219,6 @@ cris_expand_epilogue (void)
   /* Restore frame pointer if necessary.  */
   if (frame_pointer_needed)
     {
-      rtx insn;
 
       emit_insn (gen_cris_frame_deallocated_barrier ());
 
@@ -3229,7 +3226,7 @@ cris_expand_epilogue (void)
       mem = gen_rtx_MEM (SImode, gen_rtx_POST_INC (SImode,
                                                   stack_pointer_rtx));
       set_mem_alias_set (mem, get_frame_alias_set ());
-      insn = emit_move_insn (hard_frame_pointer_rtx, mem);
+      rtx_insn *insn = emit_move_insn (hard_frame_pointer_rtx, mem);
 
       /* Whenever we emit insns with post-incremented addresses
         ourselves, we must add a post-inc note manually.  */
@@ -3258,13 +3255,12 @@ cris_expand_epilogue (void)
       if (crtl->calls_eh_return)
        {
          rtx mem;
-         rtx insn;
          rtx srpreg = gen_raw_REG (SImode, CRIS_SRP_REGNUM);
          mem = gen_rtx_MEM (SImode,
                             gen_rtx_POST_INC (SImode,
                                               stack_pointer_rtx));
          set_mem_alias_set (mem, get_frame_alias_set ());
-         insn = emit_move_insn (srpreg, mem);
+         rtx_insn *insn = emit_move_insn (srpreg, mem);
 
          /* Whenever we emit insns with post-incremented addresses
             ourselves, we must add a post-inc note manually.  */
@@ -3291,13 +3287,12 @@ cris_expand_epilogue (void)
        {
          rtx mem;
          rtx srpreg = gen_raw_REG (SImode, CRIS_SRP_REGNUM);
-         rtx insn;
 
          mem = gen_rtx_MEM (SImode,
                             gen_rtx_POST_INC (SImode,
                                               stack_pointer_rtx));
          set_mem_alias_set (mem, get_frame_alias_set ());
-         insn = emit_move_insn (srpreg, mem);
+         rtx_insn *insn = emit_move_insn (srpreg, mem);
 
          /* Whenever we emit insns with post-incremented addresses
             ourselves, we must add a post-inc note manually.  */
@@ -3389,7 +3384,7 @@ cris_emit_movem_store (rtx dest, rtx nregs_rtx, int 
increment,
   rtvec vec;
   int eltno = 1;
   int i;
-  rtx insn;
+  rtx_insn *insn;
   rtx destreg = XEXP (dest, 0);
   unsigned int regno = nregs - 1;
   int regno_inc = -1;
diff --git a/gcc/config/cris/cris.md b/gcc/config/cris/cris.md
index 1bb6ae96b1f7..98963800df17 100644
--- a/gcc/config/cris/cris.md
+++ b/gcc/config/cris/cris.md
@@ -535,7 +535,6 @@
       && ! reload_completed
       && ! lra_in_progress)
     {
-      rtx insns;
       rtx op0 = operands[0];
       rtx op1 = operands[1];
 
@@ -544,7 +543,7 @@
                      operand_subword (op1, 0, 1, DImode));
       emit_move_insn (operand_subword (op0, 1, 1, DImode),
                      operand_subword (op1, 1, 1, DImode));
-      insns = end_sequence ();
+      rtx_insn *insns = end_sequence ();
 
       emit_insn (insns);
       DONE;
diff --git a/gcc/config/csky/csky.cc b/gcc/config/csky/csky.cc
index fe4134eb4722..23b9a586aba8 100644
--- a/gcc/config/csky/csky.cc
+++ b/gcc/config/csky/csky.cc
@@ -1163,7 +1163,7 @@ get_csky_barrier_cost (rtx_insn *insn)
      but at the moment, the basic block information seems to be
      corrupt by this stage of the compilation.  */
   int base_cost = 50;
-  rtx next = next_nonnote_insn (insn);
+  rtx_insn *next = next_nonnote_insn (insn);
 
   if (next != NULL && GET_CODE (next) == CODE_LABEL)
     base_cost -= 20;
@@ -5755,8 +5755,9 @@ csky_expand_prologue (void)
                                       plus_constant (Pmode,
                                                      stack_pointer_rtx,
                                                      offset));
-               rtx insn = emit_insn (gen_movsi (dst,
-                                                gen_rtx_REG (SImode, regno)));
+               rtx_insn *insn = emit_insn (gen_movsi (dst,
+                                                      gen_rtx_REG (SImode,
+                                                                   regno)));
                RTX_FRAME_RELATED_P (insn) = 1;
                if (offset == stm_size)
                  break;
diff --git a/gcc/config/fr30/fr30.cc b/gcc/config/fr30/fr30.cc
index 40b269d8c818..d1d100791888 100644
--- a/gcc/config/fr30/fr30.cc
+++ b/gcc/config/fr30/fr30.cc
@@ -280,7 +280,7 @@ void
 fr30_expand_prologue (void)
 {
   int regno;
-  rtx insn;
+  rtx_insn *insn;
 
   if (! current_frame_info.initialised)
     fr30_compute_frame_size (0, 0);
@@ -886,7 +886,6 @@ fr30_move_double (rtx * operands)
   enum rtx_code src_code = GET_CODE (src);
   enum rtx_code dest_code = GET_CODE (dest);
   machine_mode mode = GET_MODE (dest);
-  rtx val;
 
   start_sequence ();
 
@@ -976,7 +975,7 @@ fr30_move_double (rtx * operands)
     /* This should have been prevented by the constraints on movdi_insn.  */
     gcc_unreachable ();
 
-  val = end_sequence ();
+  rtx_insn *val = end_sequence ();
 
   return val;
 }
diff --git a/gcc/config/frv/frv.cc b/gcc/config/frv/frv.cc
index 033eafb366ae..c223ee8674b7 100644
--- a/gcc/config/frv/frv.cc
+++ b/gcc/config/frv/frv.cc
@@ -1557,7 +1557,7 @@ frv_dwarf_store (rtx reg, int offset)
 static void
 frv_frame_insn (rtx pattern, rtx dwarf_pattern)
 {
-  rtx insn = emit_insn (pattern);
+  rtx_insn *insn = emit_insn (pattern);
   RTX_FRAME_RELATED_P (insn) = 1;
   REG_NOTES (insn) = alloc_EXPR_LIST (REG_FRAME_RELATED_EXPR,
                                      dwarf_pattern,
@@ -4737,7 +4737,7 @@ frv_emit_scc (rtx operands[])
 rtx
 frv_split_scc (rtx dest, rtx test, rtx cc_reg, rtx cr_reg, HOST_WIDE_INT value)
 {
-  rtx ret;
+  rtx_insn *ret;
 
   start_sequence ();
 
@@ -4854,7 +4854,7 @@ frv_split_cond_move (rtx operands[])
   rtx src1     = operands[3];
   rtx src2     = operands[4];
   rtx cr_reg   = operands[5];
-  rtx ret;
+  rtx_insn *ret;
   machine_mode cr_mode = GET_MODE (cr_reg);
 
   start_sequence ();
@@ -5003,7 +5003,7 @@ frv_split_minmax (rtx operands[])
   rtx src2     = operands[3];
   rtx cc_reg   = operands[4];
   rtx cr_reg   = operands[5];
-  rtx ret;
+  rtx_insn *ret;
   enum rtx_code test_code;
   machine_mode cr_mode = GET_MODE (cr_reg);
 
@@ -5075,7 +5075,7 @@ frv_split_abs (rtx operands[])
   rtx src      = operands[1];
   rtx cc_reg   = operands[2];
   rtx cr_reg   = operands[3];
-  rtx ret;
+  rtx_insn *ret;
 
   start_sequence ();
 
diff --git a/gcc/config/ft32/ft32.cc b/gcc/config/ft32/ft32.cc
index abaa125de734..79ddab205a93 100644
--- a/gcc/config/ft32/ft32.cc
+++ b/gcc/config/ft32/ft32.cc
@@ -437,7 +437,7 @@ void
 ft32_expand_prologue (void)
 {
   int regno;
-  rtx insn;
+  rtx_insn *insn;
 
   ft32_compute_frame ();
 
diff --git a/gcc/config/gcn/gcn.cc b/gcc/config/gcn/gcn.cc
index 26b1fb1c571a..9628d8f7282b 100644
--- a/gcc/config/gcn/gcn.cc
+++ b/gcc/config/gcn/gcn.cc
@@ -3240,7 +3240,7 @@ move_callee_saved_registers (rtx sp, machine_function 
*offsets,
        saved_scalars++;
       }
 
-  rtx move_scalars = end_sequence ();
+  rtx_insn *move_scalars = end_sequence ();
   start_sequence ();
 
   /* Ensure that all vector lanes are moved.  */
@@ -3290,9 +3290,10 @@ move_callee_saved_registers (rtx sp, machine_function 
*offsets,
 
        if (prologue)
          {
-           rtx insn = emit_insn (gen_movv64si_exec (vspmem, reg,
-                                                    gcn_gen_undef (V64SImode),
-                                                    exec));
+           rtx_insn *insn
+             = emit_insn (gen_movv64si_exec (vspmem, reg,
+                                             gcn_gen_undef (V64SImode),
+                                             exec));
 
            /* Add CFI metadata.  */
            rtx note;
@@ -3377,7 +3378,7 @@ move_callee_saved_registers (rtx sp, machine_function 
*offsets,
        offset += size;
       }
 
-  rtx move_vectors = end_sequence ();
+  rtx_insn *move_vectors = end_sequence ();
 
   if (prologue)
     {
@@ -3466,8 +3467,9 @@ gcn_expand_prologue ()
             the note.  */
          rtx scc = gen_rtx_REG (BImode, SCC_REG);
          rtx adjustment = gen_int_mode (sp_adjust, SImode);
-         rtx insn = emit_insn (gen_addsi3_scalar_carry (sp_lo, sp_lo,
-                                                        adjustment, scc));
+         rtx_insn *insn = emit_insn (gen_addsi3_scalar_carry (sp_lo, sp_lo,
+                                                              adjustment,
+                                                              scc));
          if (!offsets->need_frame_pointer)
            {
              RTX_FRAME_RELATED_P (insn) = 1;
@@ -3487,8 +3489,9 @@ gcn_expand_prologue ()
          rtx scc = gen_rtx_REG (BImode, SCC_REG);
          int fp_adjust = -(offsets->local_vars + offsets->outgoing_args_size);
          rtx adjustment = gen_int_mode (fp_adjust, SImode);
-         rtx insn = emit_insn (gen_addsi3_scalar_carry(fp_lo, sp_lo,
-                                                       adjustment, scc));
+         rtx_insn *insn = emit_insn (gen_addsi3_scalar_carry (fp_lo, sp_lo,
+                                                              adjustment,
+                                                              scc));
          emit_insn (gen_addcsi3_scalar (fp_hi, sp_hi,
                                         (fp_adjust < 0 ? GEN_INT (-1)
                                          : const0_rtx),
@@ -3613,7 +3616,7 @@ gcn_expand_prologue ()
          make a notional adjustment to the DWARF frame offset here.  */
       rtx dbg_adjustment = gen_int_mode (sp_adjust + offsets->callee_saves,
                                         DImode);
-      rtx insn;
+      rtx_insn *insn;
       if (sp_adjust > 0)
        {
          rtx scc = gen_rtx_REG (BImode, SCC_REG);
diff --git a/gcc/config/ia64/ia64.cc b/gcc/config/ia64/ia64.cc
index 624d06f72f1d..e2e00348bdc9 100644
--- a/gcc/config/ia64/ia64.cc
+++ b/gcc/config/ia64/ia64.cc
@@ -1584,7 +1584,8 @@ ia64_split_tmode (rtx out[2], rtx in, bool reversed, bool 
dead)
 void
 ia64_split_tmode_move (rtx operands[])
 {
-  rtx in[2], out[2], insn;
+  rtx in[2], out[2];
+  rtx_insn *insn;
   rtx fixup[2];
   bool dead = false;
   bool reversed = false;
diff --git a/gcc/config/lm32/lm32.cc b/gcc/config/lm32/lm32.cc
index 620a162e0b10..21e78a961d6d 100644
--- a/gcc/config/lm32/lm32.cc
+++ b/gcc/config/lm32/lm32.cc
@@ -166,7 +166,7 @@ lm32_return_in_memory (tree type)
 static rtx
 emit_add (rtx dest, rtx src0, rtx src1)
 {
-  rtx insn;
+  rtx_insn *insn;
   insn = emit_insn (gen_addsi3 (dest, src0, src1));
   return insn;
 }
diff --git a/gcc/config/loongarch/loongarch.cc 
b/gcc/config/loongarch/loongarch.cc
index b0f7abc04834..3cbc288ab758 100644
--- a/gcc/config/loongarch/loongarch.cc
+++ b/gcc/config/loongarch/loongarch.cc
@@ -799,9 +799,7 @@ loongarch_setup_incoming_varargs (cumulative_args_t cum,
 static void
 loongarch_set_frame_expr (rtx frame_pattern)
 {
-  rtx insn;
-
-  insn = get_last_insn ();
+  rtx_insn *insn = get_last_insn ();
   RTX_FRAME_RELATED_P (insn) = 1;
   REG_NOTES (insn) = alloc_EXPR_LIST (REG_FRAME_RELATED_EXPR, frame_pattern,
                                      REG_NOTES (insn));
@@ -1447,7 +1445,7 @@ loongarch_expand_epilogue (int style)
   HOST_WIDE_INT step1 = frame->total_size;
   HOST_WIDE_INT step2 = 0;
   rtx ra = gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM);
-  rtx insn;
+  rtx_insn *insn;
 
   /* We need to add memory barrier to prevent read from deallocated stack.  */
   bool need_barrier_p
diff --git a/gcc/config/loongarch/loongarch.md 
b/gcc/config/loongarch/loongarch.md
index cccb0ed8612f..ceacc5995e6c 100644
--- a/gcc/config/loongarch/loongarch.md
+++ b/gcc/config/loongarch/loongarch.md
@@ -4148,7 +4148,8 @@
                                            operands[1]));
   else
     {
-      rtx call = emit_call_insn (gen_sibcall_internal (target, operands[1]));
+      rtx_insn *call
+       = emit_call_insn (gen_sibcall_internal (target, operands[1]));
 
       if (TARGET_CMODEL_MEDIUM && !REG_P (target))
        clobber_reg (&CALL_INSN_FUNCTION_USAGE (call),
@@ -4219,7 +4220,7 @@
                                                           arg2));
       else
        {
-         rtx call
+         rtx_insn *call
            = emit_call_insn (gen_sibcall_value_multiple_internal (arg1,
                                                                   target,
                                                                   operands[2],
@@ -4243,9 +4244,10 @@
                                                  operands[2]));
       else
        {
-         rtx call = emit_call_insn (gen_sibcall_value_internal (operands[0],
-                                                                target,
-                                                                operands[2]));
+         rtx_insn *call
+           = emit_call_insn (gen_sibcall_value_internal (operands[0],
+                                                         target,
+                                                         operands[2]));
 
          if (TARGET_CMODEL_MEDIUM && !REG_P (target))
            clobber_reg (&CALL_INSN_FUNCTION_USAGE (call),
diff --git a/gcc/config/m32r/m32r.cc b/gcc/config/m32r/m32r.cc
index 232bdc6ecd46..a9ec37aebe6c 100644
--- a/gcc/config/m32r/m32r.cc
+++ b/gcc/config/m32r/m32r.cc
@@ -1052,7 +1052,7 @@ gen_split_move_double (rtx operands[])
   machine_mode mode = GET_MODE (operands[0]);
   rtx dest = operands[0];
   rtx src  = operands[1];
-  rtx val;
+  rtx_insn *val;
 
   /* We might have (SUBREG (MEM)) here, so just get rid of the
      subregs to make this code simpler.  It is safe to call
@@ -1777,10 +1777,8 @@ m32r_output_function_prologue (FILE * file)
 static void
 pop (int regno)
 {
-  rtx x;
-
-  x = emit_insn (gen_movsi_pop (gen_rtx_REG (Pmode, regno),
-                               stack_pointer_rtx));
+  rtx_insn *x = emit_insn (gen_movsi_pop (gen_rtx_REG (Pmode, regno),
+                                         stack_pointer_rtx));
   add_reg_note (x, REG_INC, stack_pointer_rtx);
 }
 
diff --git a/gcc/config/mmix/mmix.cc b/gcc/config/mmix/mmix.cc
index 8b27dee035a2..fa7a40c17e6e 100644
--- a/gcc/config/mmix/mmix.cc
+++ b/gcc/config/mmix/mmix.cc
@@ -2127,7 +2127,7 @@ mmix_expand_prologue (void)
 
   if (frame_pointer_needed)
     {
-      rtx insn;
+      rtx_insn *insn;
 
       if (offset < 0)
        {
@@ -2159,7 +2159,7 @@ mmix_expand_prologue (void)
   if (MMIX_CFUN_NEEDS_SAVED_EH_RETURN_ADDRESS)
     {
       rtx tmpreg, retreg;
-      rtx insn;
+      rtx_insn *insn;
 
       /* Store the return-address, if one is needed on the stack.  We
         usually store it in a register when needed, but that doesn't work
@@ -2260,7 +2260,7 @@ mmix_expand_prologue (void)
         && df_regs_ever_live_p (regno) && !call_used_or_fixed_reg_p (regno))
        || IS_MMIX_EH_RETURN_DATA_REG (regno))
       {
-       rtx insn;
+       rtx_insn *insn;
 
        if (offset < 0)
          {
@@ -2570,7 +2570,7 @@ mmix_gen_compare_reg (RTX_CODE code, rtx x, rtx y)
 static void
 mmix_emit_sp_add (HOST_WIDE_INT offset)
 {
-  rtx insn;
+  rtx_insn *insn;
 
   if (offset < 0)
     {
diff --git a/gcc/config/moxie/moxie.cc b/gcc/config/moxie/moxie.cc
index d86ef3132487..4f79f4b2e3f9 100644
--- a/gcc/config/moxie/moxie.cc
+++ b/gcc/config/moxie/moxie.cc
@@ -278,7 +278,7 @@ void
 moxie_expand_prologue (void)
 {
   int regno;
-  rtx insn;
+  rtx_insn *insn;
 
   moxie_compute_frame ();
 
diff --git a/gcc/config/nds32/nds32-md-auxiliary.cc 
b/gcc/config/nds32/nds32-md-auxiliary.cc
index f45f63daa7d3..d8378b9af789 100644
--- a/gcc/config/nds32/nds32-md-auxiliary.cc
+++ b/gcc/config/nds32/nds32-md-auxiliary.cc
@@ -1227,7 +1227,7 @@ nds32_expand_float_movcc (rtx *operands)
 void
 nds32_emit_push_fpr_callee_saved (int base_offset)
 {
-  rtx fpu_insn;
+  rtx_insn *fpu_insn;
   rtx reg, mem;
   unsigned int regno = cfun->machine->callee_saved_first_fpr_regno;
   unsigned int last_fpr = cfun->machine->callee_saved_last_fpr_regno;
@@ -1249,7 +1249,7 @@ nds32_emit_push_fpr_callee_saved (int base_offset)
 void
 nds32_emit_pop_fpr_callee_saved (int gpr_padding_size)
 {
-  rtx fpu_insn;
+  rtx_insn *fpu_insn;
   rtx reg, mem, addr;
   rtx dwarf, adjust_sp_rtx;
   unsigned int regno = cfun->machine->callee_saved_first_fpr_regno;
@@ -1289,7 +1289,7 @@ nds32_emit_v3pop_fpr_callee_saved (int base)
 {
   int fpu_base_addr = base;
   int regno;
-  rtx fpu_insn;
+  rtx_insn *fpu_insn;
   rtx reg, mem;
   rtx dwarf;
 
@@ -3672,7 +3672,8 @@ nds32_legitimize_tls_address (rtx x)
 {
   rtx tmp_reg;
   rtx tp_reg = gen_rtx_REG (Pmode, TP_REGNUM);
-  rtx pat, insns, reg0;
+  rtx pat, reg0;
+  rtx_insn *insns;
   int relax_group_id = nds32_alloc_relax_group_id ();
 
   if (GET_CODE (x) == SYMBOL_REF)
diff --git a/gcc/config/nds32/nds32.cc b/gcc/config/nds32/nds32.cc
index 7156baca4f2d..0aae11125071 100644
--- a/gcc/config/nds32/nds32.cc
+++ b/gcc/config/nds32/nds32.cc
@@ -4986,7 +4986,7 @@ nds32_expand_epilogue (bool sibcall_p)
         CFA is described using $ta then SP is modified.  */
 
       rtx ta_reg;
-      rtx insn;
+      rtx_insn *insn;
 
       ta_reg = gen_rtx_REG (SImode, TA_REGNUM);
 
diff --git a/gcc/config/nds32/nds32.md b/gcc/config/nds32/nds32.md
index 4b05c5f30a2a..aaca31660a54 100644
--- a/gcc/config/nds32/nds32.md
+++ b/gcc/config/nds32/nds32.md
@@ -1501,7 +1501,7 @@
              (clobber (reg:SI TA_REGNUM))])]
   ""
   {
-    rtx insn;
+    rtx_insn *insn;
     rtx sym = XEXP (operands[0], 0);
 
     if (TARGET_ICT_MODEL_LARGE
@@ -1587,7 +1587,7 @@
              (clobber (reg:SI TA_REGNUM))])]
   ""
   {
-    rtx insn;
+    rtx_insn *insn;
     rtx sym = XEXP (operands[1], 0);
 
     if (TARGET_ICT_MODEL_LARGE
diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index 39ea6e6f923d..7177328c1e81 100644
--- a/gcc/config/nvptx/nvptx.cc
+++ b/gcc/config/nvptx/nvptx.cc
@@ -4602,7 +4602,7 @@ nvptx_propagate (bool is_call, basic_block block, 
rtx_insn *insn,
        }
       emit_insn (gen_rtx_CLOBBER (GET_MODE (tmp), tmp));
       emit_insn (gen_rtx_CLOBBER (GET_MODE (ptr), ptr));
-      rtx cpy = end_sequence ();
+      rtx_insn *cpy = end_sequence ();
       insn = emit_insn_after (cpy, insn);
     }
 
diff --git a/gcc/config/or1k/or1k.cc b/gcc/config/or1k/or1k.cc
index 89076ae02fc2..52dbb57a51c5 100644
--- a/gcc/config/or1k/or1k.cc
+++ b/gcc/config/or1k/or1k.cc
@@ -190,7 +190,7 @@ or1k_save_reg (int regno, HOST_WIDE_INT offset)
   rtx reg = gen_rtx_REG (Pmode, regno);
   rtx mem = gen_frame_mem (SImode, plus_constant (Pmode, stack_pointer_rtx,
                                                  offset));
-  rtx insn = emit_move_insn (mem, reg);
+  rtx_insn *insn = emit_move_insn (mem, reg);
   RTX_FRAME_RELATED_P (insn) = 1;
 }
 
@@ -214,7 +214,7 @@ or1k_expand_prologue (void)
 {
   HOST_WIDE_INT sp_offset = -cfun->machine->total_size;
   HOST_WIDE_INT reg_offset, this_offset;
-  rtx insn;
+  rtx_insn *insn;
 
   if (flag_stack_usage_info)
     current_function_static_stack_size = -sp_offset;
@@ -324,7 +324,8 @@ void
 or1k_expand_epilogue (void)
 {
   HOST_WIDE_INT reg_offset, sp_offset;
-  rtx insn, cfa_restores = NULL;
+  rtx_insn *insn;
+  rtx cfa_restores = NULL;
 
   sp_offset = cfun->machine->total_size;
   if (sp_offset == 0)
diff --git a/gcc/config/pru/pru.cc b/gcc/config/pru/pru.cc
index 4c85bed1443a..d6348ec296b3 100644
--- a/gcc/config/pru/pru.cc
+++ b/gcc/config/pru/pru.cc
@@ -165,7 +165,7 @@ static rtx
 pru_add3_frame_adjust (rtx op0, rtx op1, int addendum,
                       const enum reg_note kind)
 {
-  rtx insn;
+  rtx_insn *insn;
 
   rtx op0_adjust = gen_rtx_SET (op0, plus_constant (Pmode, op1, addendum));
 
diff --git a/gcc/config/pru/pru.md b/gcc/config/pru/pru.md
index 4c3c9c554c0f..0487409326ed 100644
--- a/gcc/config/pru/pru.md
+++ b/gcc/config/pru/pru.md
@@ -619,7 +619,6 @@
 
   if (nbits == 1)
     {
-      rtx j;
       rtx src = gen_reg_rtx (<MODE>mode);
       rtx dst = operands[0];
 
@@ -631,7 +630,7 @@
                                               <MODE>mode)));
 
       rtx_code_label *skip_set_label = gen_label_rtx ();
-      j = emit_jump_insn (gen_cbranch_qbbx_eq<mode><mode><mode>4 (
+      rtx_insn *j = emit_jump_insn (gen_cbranch_qbbx_eq<mode><mode><mode>4 (
                                                  src,
                                                  GEN_INT (0),
                                                  skip_set_label));
@@ -934,18 +933,17 @@
   if (nshifts == 1)
     {
       rtx_code_label *skip_hiset_label;
-      rtx j;
 
       emit_insn (gen_rtx_SET (dst_lo,
                              gen_rtx_LSHIFTRT (SImode, src_lo, const1_rtx)));
 
       /* The code generated by `genemit' would create a LABEL_REF.  */
       skip_hiset_label = gen_label_rtx ();
-      j = emit_jump_insn (gen_cbranch_qbbx_const (EQ,
-                                                 SImode,
-                                                 src_hi,
-                                                 GEN_INT (0),
-                                                 skip_hiset_label));
+      rtx_insn *j = emit_jump_insn (gen_cbranch_qbbx_const (EQ,
+                                                           SImode,
+                                                           src_hi,
+                                                           GEN_INT (0),
+                                                           skip_hiset_label));
       JUMP_LABEL (j) = skip_hiset_label;
       LABEL_NUSES (skip_hiset_label)++;
 
@@ -1025,17 +1023,16 @@
   if (nshifts == 1)
     {
       rtx_code_label *skip_hiset_label;
-      rtx j;
 
       emit_insn (gen_rtx_SET (dst_hi,
                              gen_rtx_ASHIFT (SImode, src_hi, const1_rtx)));
 
       skip_hiset_label = gen_label_rtx ();
-      j = emit_jump_insn (gen_cbranch_qbbx_const (EQ,
-                                                 SImode,
-                                                 src_lo,
-                                                 GEN_INT (31),
-                                                 skip_hiset_label));
+      rtx_insn *j = emit_jump_insn (gen_cbranch_qbbx_const (EQ,
+                                                           SImode,
+                                                           src_lo,
+                                                           GEN_INT (31),
+                                                           skip_hiset_label));
       JUMP_LABEL (j) = skip_hiset_label;
       LABEL_NUSES (skip_hiset_label)++;
 
diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index 769d027d96f6..974bfe54b639 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -9296,9 +9296,7 @@ riscv_elf_select_rtx_section (machine_mode mode, rtx x,
 static void
 riscv_set_frame_expr (rtx frame_pattern)
 {
-  rtx insn;
-
-  insn = get_last_insn ();
+  rtx_insn *insn = get_last_insn ();
   RTX_FRAME_RELATED_P (insn) = 1;
   REG_NOTES (insn) = alloc_EXPR_LIST (REG_FRAME_RELATED_EXPR,
                                      frame_pattern,
@@ -10098,7 +10096,7 @@ riscv_for_each_saved_v_reg (poly_int64 &remaining_size,
       else
        {
          vlen = RISCV_PROLOGUE_TEMP (Pmode);
-         rtx insn
+         rtx_insn *insn
            = emit_move_insn (vlen, gen_int_mode (UNITS_PER_V_REG, Pmode));
          RTX_FRAME_RELATED_P (insn) = 1;
        }
@@ -10117,7 +10115,7 @@ riscv_for_each_saved_v_reg (poly_int64 &remaining_size,
            bool handle_reg = !cfun->machine->reg_is_wrapped_separately[regno];
            if (handle_reg)
              {
-               rtx insn = NULL_RTX;
+               rtx_insn *insn = nullptr;
                if (CONST_INT_P (vlen))
                  {
                    gcc_assert (SMALL_OPERAND (-INTVAL (vlen)));
@@ -10146,7 +10144,7 @@ riscv_for_each_saved_v_reg (poly_int64 &remaining_size,
            if (handle_reg)
              {
                riscv_save_restore_reg (m1_mode, regno, 0, fn);
-               rtx insn = emit_insn (
+               rtx_insn *insn = emit_insn (
                  gen_add3_insn (stack_pointer_rtx, stack_pointer_rtx, vlen));
                gcc_assert (insn != NULL_RTX);
                RTX_FRAME_RELATED_P (insn) = 1;
@@ -10884,7 +10882,7 @@ static void
 riscv_gen_multi_pop_insn (bool use_popret, unsigned mask,
                          unsigned multipop_size)
 {
-  rtx insn;
+  rtx_insn *insn;
   unsigned regs_count = riscv_multi_push_regs_count (mask);
 
   if (!use_popret)
@@ -10931,7 +10929,7 @@ riscv_expand_epilogue (int style)
   rtx ra = gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM);
   rtx t0 = gen_rtx_REG (Pmode, RISCV_PROLOGUE_TEMP_REGNUM);
   unsigned th_int_mask = 0;
-  rtx insn;
+  rtx_insn *insn;
 
   /* Avoid referencing an unused frame pointer.  */
   rtx stack_tie_reg = frame_pointer_needed
diff --git a/gcc/config/riscv/thead.cc b/gcc/config/riscv/thead.cc
index acf661f83e73..33d9dc28dd45 100644
--- a/gcc/config/riscv/thead.cc
+++ b/gcc/config/riscv/thead.cc
@@ -347,7 +347,8 @@ th_mempair_save_regs (rtx operands[4])
   rtx set1 = gen_rtx_SET (operands[0], operands[1]);
   rtx set2 = gen_rtx_SET (operands[2], operands[3]);
   rtx dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (2));
-  rtx insn = emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set1, 
set2)));
+  rtx_insn *insn = emit_insn (gen_rtx_PARALLEL (VOIDmode,
+                                               gen_rtvec (2, set1, set2)));
   RTX_FRAME_RELATED_P (insn) = 1;
 
   XVECEXP (dwarf, 0, 0) = copy_rtx (set1);
@@ -365,7 +366,8 @@ th_mempair_restore_regs (rtx operands[4])
 {
   rtx set1 = gen_rtx_SET (operands[0], operands[1]);
   rtx set2 = gen_rtx_SET (operands[2], operands[3]);
-  rtx insn = emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, set1, 
set2)));
+  rtx_insn *insn = emit_insn (gen_rtx_PARALLEL (VOIDmode,
+                                               gen_rtvec (2, set1, set2)));
   RTX_FRAME_RELATED_P (insn) = 1;
   add_reg_note (insn, REG_CFA_RESTORE, operands[0]);
   add_reg_note (insn, REG_CFA_RESTORE, operands[2]);
diff --git a/gcc/config/rs6000/rs6000-logue.cc 
b/gcc/config/rs6000/rs6000-logue.cc
index 4c0b939d43cd..9366ddd2880d 100644
--- a/gcc/config/rs6000/rs6000-logue.cc
+++ b/gcc/config/rs6000/rs6000-logue.cc
@@ -3451,7 +3451,7 @@ rs6000_emit_prologue (void)
     {
       rtx tmp_reg, tmp_reg_si, hi, lo, compare_result;
       rtx jump;
-      rtx join_insn, note;
+      rtx note;
       rtx_insn *save_insn;
       long toc_restore_insn;
 
@@ -3512,7 +3512,7 @@ rs6000_emit_prologue (void)
                               copy_rtx (PATTERN (save_insn)), NULL_RTX);
       RTX_FRAME_RELATED_P (save_insn) = 0;
 
-      join_insn = emit_insn (gen_blockage ());
+      rtx_insn *join_insn = emit_insn (gen_blockage ());
       REG_NOTES (join_insn) = note;
       RTX_FRAME_RELATED_P (join_insn) = 1;
 
@@ -4182,8 +4182,9 @@ restore_saved_cr (rtx reg, bool using_mfcr_multiple, bool 
exit_func)
     for (i = 0; i < 8; i++)
       if (save_reg_p (CR0_REGNO + i))
        {
-         rtx insn = emit_insn (gen_movsi_to_cr_one
-                                (gen_rtx_REG (CCmode, CR0_REGNO + i), reg));
+         rtx_insn *insn = emit_insn (gen_movsi_to_cr_one
+                                     (gen_rtx_REG (CCmode, CR0_REGNO + i),
+                                      reg));
 
          /* For the ELFv2 ABI we generate a CFA_RESTORE for each
             CR field separately, attached to the insn that in fact
diff --git a/gcc/config/rs6000/rs6000-string.cc 
b/gcc/config/rs6000/rs6000-string.cc
index dd594df32c83..08313089ef69 100644
--- a/gcc/config/rs6000/rs6000-string.cc
+++ b/gcc/config/rs6000/rs6000-string.cc
@@ -1853,7 +1853,7 @@ expand_block_compare_gpr(unsigned HOST_WIDE_INT bytes, 
unsigned int base_align,
              if (final_label)
                {
                  rtx fin_ref = gen_rtx_LABEL_REF (VOIDmode, final_label);
-                 rtx j = emit_jump_insn (gen_rtx_SET (pc_rtx, fin_ref));
+                 rtx_insn *j = emit_jump_insn (gen_rtx_SET (pc_rtx, fin_ref));
                  JUMP_LABEL (j) = final_label;
                  LABEL_NUSES (final_label) += 1;
                  emit_barrier ();
@@ -2305,7 +2305,7 @@ expand_strncmp_gpr_sequence (unsigned HOST_WIDE_INT 
bytes_to_compare,
              do_sub3 (result_reg, tmp_reg_src1, tmp_reg_src2);
 
              rtx fin_ref = gen_rtx_LABEL_REF (VOIDmode, final_move_label);
-             rtx j = emit_jump_insn (gen_rtx_SET (pc_rtx, fin_ref));
+             rtx_insn *j = emit_jump_insn (gen_rtx_SET (pc_rtx, fin_ref));
              JUMP_LABEL (j) = final_move_label;
              LABEL_NUSES (final_move_label) += 1;
              emit_barrier ();
@@ -2526,7 +2526,7 @@ expand_strn_compare (rtx operands[], int no_length)
       /* Generate code that checks distance to 4k boundary for this case.  */
       begin_compare_label = gen_label_rtx ();
       rtx_code_label *strncmp_label = gen_label_rtx ();
-      rtx jmp;
+      rtx_insn *jmp;
 
       /* Strncmp for power8 in glibc does this:
         rldicl r8,r3,0,52
@@ -2657,7 +2657,7 @@ expand_strn_compare (rtx operands[], int no_length)
        }
 
       rtx fin_ref = gen_rtx_LABEL_REF (VOIDmode, final_label);
-      rtx jmp = emit_jump_insn (gen_rtx_SET (pc_rtx, fin_ref));
+      rtx_insn *jmp = emit_jump_insn (gen_rtx_SET (pc_rtx, fin_ref));
       JUMP_LABEL (jmp) = final_label;
       LABEL_NUSES (final_label) += 1;
       emit_barrier ();
diff --git a/gcc/config/rx/rx.cc b/gcc/config/rx/rx.cc
index 082611d70c4d..f157bce71bca 100644
--- a/gcc/config/rx/rx.cc
+++ b/gcc/config/rx/rx.cc
@@ -1715,7 +1715,7 @@ ok_for_max_constant (HOST_WIDE_INT val)
 static void
 gen_safe_add (rtx dest, rtx src, rtx val, bool is_frame_related)
 {
-  rtx insn;
+  rtx_insn *insn;
 
   if (val == NULL_RTX || INTVAL (val) == 0)
     {
@@ -1748,7 +1748,7 @@ gen_safe_add (rtx dest, rtx src, rtx val, bool 
is_frame_related)
 static void
 push_regs (unsigned int high, unsigned int low)
 {
-  rtx insn;
+  rtx_insn *insn;
 
   if (low == high)
     insn = emit_insn (gen_stack_push (gen_rtx_REG (SImode, low)));
diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index fb190c036bf7..7549156e8646 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -11755,7 +11755,7 @@ static rtx
 save_fpr (rtx base, int offset, int regnum)
 {
   rtx addr;
-  rtx insn;
+  rtx_insn *insn;
 
   addr = gen_rtx_MEM (DFmode, plus_constant (Pmode, base, offset));
 
diff --git a/gcc/config/sh/sh.cc b/gcc/config/sh/sh.cc
index e915c9343565..09036b16a6d3 100644
--- a/gcc/config/sh/sh.cc
+++ b/gcc/config/sh/sh.cc
@@ -5937,7 +5937,8 @@ sh_reorg (void)
 
       for (insn = first; insn; insn = NEXT_INSN (insn))
        {
-         rtx pattern, reg, set, dies;
+         rtx pattern, reg, set;
+         rtx_insn *dies;
          rtx_code_label *label;
          rtx_insn *link, *scan;
          int rescan = 0, foundinsn = 0;
@@ -6010,7 +6011,7 @@ sh_reorg (void)
             by reload, since there may not be a REG_DEAD note for the
             register.  */
 
-         dies = NULL_RTX;
+         dies = nullptr;
          for (scan = NEXT_INSN (link); scan; scan = NEXT_INSN (scan))
            {
              rtx scanset;
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index 05225365b99e..ffa0932b746d 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -361,7 +361,7 @@ trace_reg_uses_1 (rtx reg, rtx_insn *start_insn, 
basic_block bb, int& count,
   if (start_insn == NULL_RTX)
     log_return_void ("[bb %d] start_insn is null\n", bb->index);
 
-  rtx end_insn = NEXT_INSN (BB_END (bb));
+  rtx_insn *end_insn = NEXT_INSN (BB_END (bb));
   if (end_insn == NULL_RTX)
     log_return_void ("[bb %d] end_insn is null\n", bb->index);
 
diff --git a/gcc/config/sparc/sparc.cc b/gcc/config/sparc/sparc.cc
index 9b191ad492d7..108dc71b8bc6 100644
--- a/gcc/config/sparc/sparc.cc
+++ b/gcc/config/sparc/sparc.cc
@@ -3976,13 +3976,12 @@ emit_tfmode_cvt (enum rtx_code code, rtx *operands)
 int
 empty_delay_slot (rtx_insn *insn)
 {
-  rtx seq;
 
   /* If no previous instruction (should not happen), return true.  */
   if (PREV_INSN (insn) == NULL)
     return 1;
 
-  seq = NEXT_INSN (PREV_INSN (insn));
+  rtx_insn *seq = NEXT_INSN (PREV_INSN (insn));
   if (GET_CODE (PATTERN (seq)) == SEQUENCE)
     return 0;
 
@@ -12506,7 +12505,8 @@ sparc_output_mi_thunk (FILE *file, tree thunk_fndecl 
ATTRIBUTE_UNUSED,
     {
       /* The hoops we have to jump through in order to generate a sibcall
         without using delay slots...  */
-      rtx spill_reg, seq, scratch = gen_rtx_REG (Pmode, 1);
+      rtx spill_reg, scratch = gen_rtx_REG (Pmode, 1);
+      rtx_insn *seq;
 
       if (flag_pic)
         {
diff --git a/gcc/config/stormy16/stormy16.cc b/gcc/config/stormy16/stormy16.cc
index da6bf3d9ebba..8caa367f6afc 100644
--- a/gcc/config/stormy16/stormy16.cc
+++ b/gcc/config/stormy16/stormy16.cc
@@ -964,7 +964,7 @@ xstormy16_split_move (machine_mode mode, rtx dest, rtx src)
   end = direction < 0 ? -1 : num_words;
   for (i = direction < 0 ? num_words - 1 : 0; i != end; i += direction)
     {
-      rtx w_src, w_dest, insn;
+      rtx w_src, w_dest;
 
       if (src_modifies)
        w_src = gen_rtx_MEM (word_mode, mem_operand);
@@ -984,7 +984,7 @@ xstormy16_split_move (machine_mode mode, rtx dest, rtx src)
       gcc_assert (GET_CODE (w_src) != SUBREG
                  && GET_CODE (w_dest) != SUBREG);
 
-      insn = emit_insn (gen_rtx_SET (w_dest, w_src));
+      rtx_insn *insn = emit_insn (gen_rtx_SET (w_dest, w_src));
       if (auto_inc_reg_rtx)
         REG_NOTES (insn) = alloc_EXPR_LIST (REG_INC,
                                             auto_inc_reg_rtx,
@@ -1164,7 +1164,8 @@ xstormy16_initial_elimination_offset (int from, int to)
 static rtx
 emit_addhi3_postreload (rtx dest, rtx src0, rtx src1)
 {
-  rtx set, clobber, insn;
+  rtx set, clobber;
+  rtx_insn *insn;
 
   set = gen_rtx_SET (dest, gen_rtx_PLUS (HImode, src0, src1));
   clobber = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (BImode, CARRY_REGNUM));
diff --git a/gcc/config/v850/v850.cc b/gcc/config/v850/v850.cc
index cd6ba13b4b30..d608469b7142 100644
--- a/gcc/config/v850/v850.cc
+++ b/gcc/config/v850/v850.cc
@@ -1726,7 +1726,7 @@ expand_prologue (void)
          code = recog (save_all, NULL, NULL);
          if (code >= 0)
            {
-             rtx insn = emit_insn (save_all);
+             rtx_insn *insn = emit_insn (save_all);
              INSN_CODE (insn) = code;
              actual_fsize -= alloc_stack;
 
@@ -1873,12 +1873,11 @@ expand_epilogue (void)
 
          if (code >= 0)
            {
-             rtx insn;
 
              actual_fsize -= alloc_stack;
              increment_stack (actual_fsize, false);
 
-             insn = emit_jump_insn (restore_all);
+             rtx_insn *insn = emit_jump_insn (restore_all);
              INSN_CODE (insn) = code;
            }
          else
diff --git a/gcc/config/vax/vax.cc b/gcc/config/vax/vax.cc
index 1d301a90dbb9..66eb2e050641 100644
--- a/gcc/config/vax/vax.cc
+++ b/gcc/config/vax/vax.cc
@@ -189,7 +189,7 @@ vax_expand_prologue (void)
   int regno, offset;
   int mask = 0;
   HOST_WIDE_INT size;
-  rtx insn;
+  rtx_insn *insn;
 
   for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++)
     if (df_regs_ever_live_p (regno) && !call_used_or_fixed_reg_p (regno))
diff --git a/gcc/config/visium/visium.cc b/gcc/config/visium/visium.cc
index d59f95ca6d13..5ba6f0d7984b 100644
--- a/gcc/config/visium/visium.cc
+++ b/gcc/config/visium/visium.cc
@@ -980,13 +980,12 @@ ok_for_simple_arith_logic_operands (rtx *, machine_mode)
 int
 empty_delay_slot (rtx_insn *insn)
 {
-  rtx seq;
 
   /* If no previous instruction (should not happen), return true.  */
   if (PREV_INSN (insn) == NULL)
     return 1;
 
-  seq = NEXT_INSN (PREV_INSN (insn));
+  rtx_insn *seq = NEXT_INSN (PREV_INSN (insn));
   if (GET_CODE (PATTERN (seq)) == SEQUENCE)
     return 0;
 
diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc
index 1f935d33505f..3d6f33f5e50e 100644
--- a/gcc/config/xtensa/xtensa.cc
+++ b/gcc/config/xtensa/xtensa.cc
@@ -1291,7 +1291,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode 
mode)
 rtx
 xtensa_copy_incoming_a7 (rtx opnd)
 {
-  rtx entry_insns = 0;
+  rtx_insn *entry_insns = 0;
   rtx reg, tmp;
   machine_mode mode;
 
@@ -4013,7 +4013,7 @@ xtensa_set_return_address (rtx address, rtx scratch)
                               total_size - UNITS_PER_WORD);
   rtx note = gen_rtx_SET (gen_frame_mem (SImode, a0_addr),
                          gen_rtx_REG (SImode, A0_REG));
-  rtx insn;
+  rtx_insn *insn;
 
   if (total_size > 1024)
     {
diff --git a/gcc/final.cc b/gcc/final.cc
index 420e00916754..18d4c73e6904 100644
--- a/gcc/final.cc
+++ b/gcc/final.cc
@@ -948,7 +948,8 @@ shorten_branches (rtx_insn *first)
 
       for (insn = first; insn != 0; insn = NEXT_INSN (insn))
        {
-         rtx min_lab = NULL_RTX, max_lab = NULL_RTX, pat;
+         rtx_insn *min_lab = nullptr, *max_lab = nullptr;
+         rtx pat;
          int len, i, min, max, insn_shuid;
          int min_align;
          addr_diff_vec_flags flags;
diff --git a/gcc/reorg.cc b/gcc/reorg.cc
index 5bda9435a174..22d23746d110 100644
--- a/gcc/reorg.cc
+++ b/gcc/reorg.cc
@@ -1225,7 +1225,7 @@ try_merge_delay_insns (rtx_insn *insn, rtx_insn *thread)
   for (trial = thread; !stop_search_p (trial, true); trial = next_trial)
     {
       rtx pat = PATTERN (trial);
-      rtx oldtrial = trial;
+      rtx_insn *oldtrial = trial;
 
       next_trial = next_nonnote_insn (trial);
 
@@ -2340,7 +2340,8 @@ fill_slots_from_thread (rtx_jump_insn *insn, rtx 
condition,
        ! stop_search_p (trial, ! thread_if_true) && (! lose || own_thread);
        trial = next_nonnote_insn (trial))
     {
-      rtx pat, old_trial;
+      rtx pat;
+      rtx_insn *old_trial;
 
       /* If we have passed a label, we no longer own this thread.  */
       if (LABEL_P (trial))
@@ -3501,7 +3502,8 @@ make_return_insns (rtx_insn *first)
   for (insn = first; insn; insn = NEXT_INSN (insn))
     {
       int flags;
-      rtx kind, real_label;
+      rtx kind;
+      rtx_insn *real_label;
 
       /* Only look at filled JUMP_INSNs that go to the end of function
         label.  */
diff --git a/gcc/tree-outof-ssa.cc b/gcc/tree-outof-ssa.cc
index f113709e50d2..c78b70914c7d 100644
--- a/gcc/tree-outof-ssa.cc
+++ b/gcc/tree-outof-ssa.cc
@@ -308,7 +308,7 @@ insert_partition_copy_on_edge (edge e, int dest, int src, 
location_t locus)
 static void
 insert_value_copy_on_edge (edge e, int dest, tree src, location_t locus)
 {
-  rtx dest_rtx, seq, x;
+  rtx dest_rtx, x;
   machine_mode dest_mode, src_mode;
   int unsignedp;
 
@@ -356,7 +356,7 @@ insert_value_copy_on_edge (edge e, int dest, tree src, 
location_t locus)
     emit_move_insn (dest_rtx, x);
   do_pending_stack_adjust ();
 
-  seq = end_sequence ();
+  rtx_insn *seq = end_sequence ();
 
   insert_insn_on_edge (seq, e);
 }

Reply via email to