https://gcc.gnu.org/g:154b24bbd9f4cc9d4ce47f70b969baa89b574144

commit r17-5855-g154b24bbd9f4cc9d4ce47f70b969baa89b574144
Author: Trevor Saunders <[email protected]>
Date:   Sat Oct 24 22:10:34 2026 +0000

    Use rtx_insn * for locals that only hold an insn
    
    gcc/ChangeLog:
    
            * config/arm/arm.cc (arm_emit_strd_push,
            get_scratch_register_on_entry,
            release_scratch_register_on_entry): Use an rtx_insn * for a
            local that only holds an insn.
            * config/i386/i386.cc (ix86_adjust_stack_and_probe): Likewise.
            * config/rs6000/rs6000-logue.cc (rs6000_emit_epilogue): Likewise.
            * config/sh/sh.cc (output_stack_adjust): Likewise.
            * config/sh/sh.md (define_split): Likewise.

Diff:
---
 gcc/config/arm/arm.cc             |  6 +++---
 gcc/config/i386/i386.cc           |  2 +-
 gcc/config/rs6000/rs6000-logue.cc |  4 ++--
 gcc/config/sh/sh.cc               |  2 +-
 gcc/config/sh/sh.md               | 24 ++++++++++++++----------
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc
index 58ed06255d7a..d0275729dc81 100644
--- a/gcc/config/arm/arm.cc
+++ b/gcc/config/arm/arm.cc
@@ -21207,7 +21207,7 @@ arm_emit_strd_push (unsigned long saved_regs_mask)
   int i, j, dwarf_index  = 0;
   int offset = 0;
   rtx dwarf = NULL_RTX;
-  rtx insn = NULL_RTX;
+  rtx_insn *insn = nullptr;
   rtx tmp, mem;
 
   /* TODO: A more efficient code can be emitted by changing the
@@ -22465,7 +22465,7 @@ get_scratch_register_on_entry (struct scratch_reg *sr, 
unsigned int regno1,
   if (sr->saved)
     {
       rtx addr = gen_rtx_PRE_DEC (Pmode, stack_pointer_rtx);
-      rtx insn = emit_set_insn (gen_frame_mem (SImode, addr), sr->reg);
+      rtx_insn *insn = emit_set_insn (gen_frame_mem (SImode, addr), sr->reg);
       rtx x = gen_rtx_SET (stack_pointer_rtx,
                           plus_constant (Pmode, stack_pointer_rtx, -4));
       RTX_FRAME_RELATED_P (insn) = 1;
@@ -22481,7 +22481,7 @@ release_scratch_register_on_entry (struct scratch_reg 
*sr)
   if (sr->saved)
     {
       rtx addr = gen_rtx_POST_INC (Pmode, stack_pointer_rtx);
-      rtx insn = emit_set_insn (sr->reg, gen_frame_mem (SImode, addr));
+      rtx_insn *insn = emit_set_insn (sr->reg, gen_frame_mem (SImode, addr));
       rtx x = gen_rtx_SET (stack_pointer_rtx,
                           plus_constant (Pmode, stack_pointer_rtx, 4));
       RTX_FRAME_RELATED_P (insn) = 1;
diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc
index 52fa3821a21f..781a0715e4aa 100644
--- a/gcc/config/i386/i386.cc
+++ b/gcc/config/i386/i386.cc
@@ -8368,7 +8368,7 @@ ix86_adjust_stack_and_probe (HOST_WIDE_INT size,
       for (i = probe_interval; i <= size; i += probe_interval)
        {
          /* Allocate PROBE_INTERVAL bytes.  */
-         rtx insn
+         rtx_insn *insn
            = pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
                                         GEN_INT (-probe_interval), -1,
                                         m->fs.cfa_reg == stack_pointer_rtx);
diff --git a/gcc/config/rs6000/rs6000-logue.cc 
b/gcc/config/rs6000/rs6000-logue.cc
index d617416652bc..100c462a40b4 100644
--- a/gcc/config/rs6000/rs6000-logue.cc
+++ b/gcc/config/rs6000/rs6000-logue.cc
@@ -4299,7 +4299,7 @@ rs6000_emit_epilogue (enum epilogue_type epilogue_type)
   rtx sp_reg_rtx = gen_rtx_REG (Pmode, 1);
   rtx frame_reg_rtx = sp_reg_rtx;
   rtx cfa_restores = NULL_RTX;
-  rtx insn;
+  rtx_insn *insn;
   rtx cr_save_reg = NULL_RTX;
   machine_mode reg_mode = Pmode;
   int reg_size = TARGET_32BIT ? 4 : 8;
@@ -4577,7 +4577,7 @@ rs6000_emit_epilogue (enum epilogue_type epilogue_type)
       emit_insn (generate_set_vrsave (reg, info, 1));
     }
 
-  insn = NULL_RTX;
+  insn = nullptr;
   /* If we have a large stack frame, restore the old stack pointer
      using the backchain.  */
   if (use_backchain_to_restore_sp)
diff --git a/gcc/config/sh/sh.cc b/gcc/config/sh/sh.cc
index 398e85a8cfc5..bac22d0ff6dc 100644
--- a/gcc/config/sh/sh.cc
+++ b/gcc/config/sh/sh.cc
@@ -6710,7 +6710,7 @@ output_stack_adjust (int size, rtx reg, int epilogue_p,
       else
        {
          rtx const_reg;
-         rtx insn;
+         rtx_insn *insn;
          int temp = epilogue_p ? 7 : 1;
          int i;
 
diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md
index 5acca403608d..61db40f2a3a0 100644
--- a/gcc/config/sh/sh.md
+++ b/gcc/config/sh/sh.md
@@ -5719,10 +5719,10 @@
    && (true_regnum (operands[0]) < 16) != (true_regnum (operands[1]) < 16)"
   [(const_int 0)]
 {
-  rtx insn, tos;
+  rtx tos;
 
   tos = gen_tmp_stack_mem (DFmode, gen_rtx_PRE_DEC (Pmode, stack_pointer_rtx));
-  insn = emit_insn (gen_movdf_i4 (tos, operands[1]));
+  rtx_insn *insn = emit_insn (gen_movdf_i4 (tos, operands[1]));
   add_reg_note (insn, REG_INC, stack_pointer_rtx);
   tos = gen_tmp_stack_mem (DFmode, gen_rtx_POST_INC (Pmode, 
stack_pointer_rtx));
   insn = emit_insn (gen_movdf_i4 (operands[0], tos));
@@ -5880,13 +5880,13 @@
   [(const_int 0)]
 {
   int regno = true_regnum (operands[0]);
-  rtx insn;
   rtx mem = SET_SRC (XVECEXP (PATTERN (curr_insn), 0, 0));
   rtx mem2
     = change_address (mem, SFmode, gen_rtx_POST_INC (Pmode, operands[1]));
-  insn = emit_insn (gen_movsf_ie (gen_rtx_REG (SFmode,
-                                              regno + SH_REG_MSW_OFFSET),
-                                 mem2));
+  rtx_insn *insn
+    = emit_insn (gen_movsf_ie (gen_rtx_REG (SFmode,
+                                           regno + SH_REG_MSW_OFFSET),
+                              mem2));
   add_reg_note (insn, REG_INC, operands[1]);
   insn = emit_insn (gen_movsf_ie (gen_rtx_REG (SFmode,
                                               regno + SH_REG_LSW_OFFSET),
@@ -5904,7 +5904,8 @@
   [(const_int 0)]
 {
   int regno = true_regnum (operands[0]);
-  rtx addr, insn;
+  rtx addr;
+  rtx_insn *insn;
   rtx mem2 = change_address (operands[1], SFmode, NULL_RTX);
   rtx reg0 = gen_rtx_REG (SFmode, regno + SH_REG_MSW_OFFSET);
   rtx reg1 = gen_rtx_REG (SFmode, regno + SH_REG_LSW_OFFSET);
@@ -5971,7 +5972,8 @@
   [(const_int 0)]
 {
   int regno = true_regnum (operands[1]);
-  rtx insn, addr;
+  rtx_insn *insn;
+  rtx addr;
   rtx reg0 = gen_rtx_REG (SFmode, regno + SH_REG_MSW_OFFSET);
   rtx reg1 = gen_rtx_REG (SFmode, regno + SH_REG_LSW_OFFSET);
 
@@ -6503,7 +6505,8 @@
   [(const_int 0)]
 {
   int regno = true_regnum (operands[0]);
-  rtx addr, insn;
+  rtx addr;
+  rtx_insn *insn;
   rtx mem2 = change_address (operands[1], SFmode, NULL_RTX);
   rtx reg0 = gen_rtx_REG (SFmode, regno + SH_REG_MSW_OFFSET);
   rtx reg1 = gen_rtx_REG (SFmode, regno + SH_REG_LSW_OFFSET);
@@ -6567,7 +6570,8 @@
   [(const_int 0)]
 {
   int regno = true_regnum (operands[1]);
-  rtx insn, addr;
+  rtx_insn *insn;
+  rtx addr;
   rtx reg0 = gen_rtx_REG (SFmode, regno + SH_REG_MSW_OFFSET);
   rtx reg1 = gen_rtx_REG (SFmode, regno + SH_REG_LSW_OFFSET);

Reply via email to