https://gcc.gnu.org/g:5f9900ec00fcaa7a44d8bdc69b77c8be5b18012e

commit r17-5850-g5f9900ec00fcaa7a44d8bdc69b77c8be5b18012e
Author: Trevor Saunders <[email protected]>
Date:   Sat Oct 24 17:39:05 2026 +0000

    Use rtx_insn * for locals set from insn returns
    
    gcc/ChangeLog:
    
            * compare-elim.cc (try_merge_compare): Use rtx_insn * for a local
            set from a function that returns an insn.
            * config/alpha/alpha.md (reload_out<mode>_safe_bwa,
            reload_out<mode>_aligned): Likewise.
            * config/arc/arc.cc (frame_restore_reg, arc_restore_callee_saves,
            arc_restore_callee_milli): Likewise.
            * config/arm/arm.cc (arm_expand_prologue): Likewise.
            * config/cris/cris.cc (cris_expand_prologue): Likewise.
            * config/lm32/lm32.cc (expand_save_restore, stack_adjust,
            lm32_expand_prologue): Likewise.
            * config/loongarch/loongarch.cc (loongarch_restore_reg): Likewise.
            * config/riscv/riscv.cc (riscv_restore_reg): Likewise.
            * config/s390/s390.cc (s390_emit_prologue): Likewise.
            * config/sh/sh_treg_combine.cc (try_combine_comparisons): Likewise.
            * config/stormy16/stormy16.cc (xstormy16_expand_prologue): Likewise.
            * config/visium/visium.cc (visium_save_regs, visium_expand_prologue,
            visium_restore_regs, visium_expand_epilogue): Likewise.

Diff:
---
 gcc/compare-elim.cc               |  2 +-
 gcc/config/alpha/alpha.md         |  4 ++--
 gcc/config/arc/arc.cc             | 10 +++++-----
 gcc/config/arm/arm.cc             | 19 ++++++++++---------
 gcc/config/cris/cris.cc           |  3 ++-
 gcc/config/lm32/lm32.cc           |  6 +++---
 gcc/config/loongarch/loongarch.cc |  2 +-
 gcc/config/riscv/riscv.cc         |  2 +-
 gcc/config/s390/s390.cc           |  3 ++-
 gcc/config/sh/sh_treg_combine.cc  |  2 +-
 gcc/config/stormy16/stormy16.cc   |  2 +-
 gcc/config/visium/visium.cc       | 17 +++++++++--------
 12 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/gcc/compare-elim.cc b/gcc/compare-elim.cc
index 85eac1462385..e4d9d57e3132 100644
--- a/gcc/compare-elim.cc
+++ b/gcc/compare-elim.cc
@@ -738,7 +738,7 @@ try_merge_compare (struct comparison *cmp)
                                           copy_rtx (src),
                                           CONST0_RTX (GET_MODE (src))));
   rtx arith_set = copy_rtx (PATTERN (def_insn));
-  rtx par = try_validate_parallel (flag_set, arith_set);
+  rtx_insn *par = try_validate_parallel (flag_set, arith_set);
   if (!par)
     {
       /* We may already have a change group going through maybe_select_cc_mode.
diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md
index 80bc27556bd0..39f25578cf44 100644
--- a/gcc/config/alpha/alpha.md
+++ b/gcc/config/alpha/alpha.md
@@ -4601,7 +4601,7 @@
 
   rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
   rtx cond = gen_rtx_EQ (DImode, status, const0_rtx);
-  rtx jump = alpha_emit_unlikely_jump (cond, label_ref);
+  rtx_insn *jump = alpha_emit_unlikely_jump (cond, label_ref);
   JUMP_LABEL (jump) = label;
 
   cfun->split_basic_blocks_after_reload = 1;
@@ -4655,7 +4655,7 @@
       rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
       rtx cond = gen_rtx_EQ (DImode, gen_rtx_SUBREG (DImode, status, 0),
                             const0_rtx);
-      rtx jump = alpha_emit_unlikely_jump (cond, label_ref);
+      rtx_insn *jump = alpha_emit_unlikely_jump (cond, label_ref);
       JUMP_LABEL (jump) = label;
 
       cfun->split_basic_blocks_after_reload = 1;
diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc
index 39306aa84da1..acecb9923556 100644
--- a/gcc/config/arc/arc.cc
+++ b/gcc/config/arc/arc.cc
@@ -3021,7 +3021,7 @@ push_reg (rtx reg)
 static int
 frame_restore_reg (rtx reg, HOST_WIDE_INT offset)
 {
-  rtx addr, insn;
+  rtx addr;
 
   if (offset)
     {
@@ -3035,7 +3035,7 @@ frame_restore_reg (rtx reg, HOST_WIDE_INT offset)
   else
     addr = gen_frame_mem (GET_MODE (reg), gen_rtx_POST_INC (Pmode,
                                                            stack_pointer_rtx));
-  insn = frame_move_inc (reg, addr, stack_pointer_rtx, 0);
+  rtx_insn *insn = frame_move_inc (reg, addr, stack_pointer_rtx, 0);
   add_reg_note (insn, REG_CFA_RESTORE, reg);
 
   if (reg == hard_frame_pointer_rtx)
@@ -3202,8 +3202,8 @@ arc_restore_callee_saves (uint64_t gmask,
     {
       rtx addr = plus_constant (Pmode, stack_pointer_rtx, offs);
       reg = gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM);
-      rtx insn = frame_move_inc (reg, gen_frame_mem (Pmode, addr),
-                                stack_pointer_rtx, NULL_RTX);
+      rtx_insn *insn = frame_move_inc (reg, gen_frame_mem (Pmode, addr),
+                                      stack_pointer_rtx, NULL_RTX);
       add_reg_note (insn, REG_CFA_RESTORE, reg);
       restore_blink = false;
     }
@@ -3691,7 +3691,7 @@ arc_restore_callee_milli (uint64_t gmask,
       mem = gen_frame_mem (SImode, plus_constant (Pmode,
                                                  stack_pointer_rtx,
                                                  off));
-      rtx tmp = frame_move_inc (reg, mem, stack_pointer_rtx, 0);
+      rtx_insn *tmp = frame_move_inc (reg, mem, stack_pointer_rtx, 0);
       add_reg_note (tmp, REG_CFA_RESTORE, reg);
       off += UNITS_PER_WORD;
     }
diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc
index 3067e887314c..a33898590d06 100644
--- a/gcc/config/arm/arm.cc
+++ b/gcc/config/arm/arm.cc
@@ -22655,7 +22655,7 @@ void
 arm_expand_prologue (void)
 {
   rtx amount;
-  rtx insn;
+  rtx_insn *insn;
   rtx ip_rtx;
   unsigned long live_regs_mask;
   unsigned long func_type;
@@ -22999,15 +22999,15 @@ arm_expand_prologue (void)
       /* Create the new frame pointer.  */
       if (TARGET_APCS_FRAME)
        {
-         insn = GEN_INT (-(4 + args_to_push + fp_offset));
-         insn = emit_insn (gen_addsi3 (hard_frame_pointer_rtx, ip_rtx, insn));
+         rtx x = GEN_INT (-(4 + args_to_push + fp_offset));
+         insn = emit_insn (gen_addsi3 (hard_frame_pointer_rtx, ip_rtx, x));
          RTX_FRAME_RELATED_P (insn) = 1;
        }
       else
        {
-         insn = GEN_INT (saved_regs - (4 + fp_offset));
+         rtx x = GEN_INT (saved_regs - (4 + fp_offset));
          insn = emit_insn (gen_addsi3 (hard_frame_pointer_rtx,
-                                       stack_pointer_rtx, insn));
+                                       stack_pointer_rtx, x));
          RTX_FRAME_RELATED_P (insn) = 1;
        }
     }
@@ -23047,14 +23047,15 @@ arm_expand_prologue (void)
   /* Recover the static chain register.  */
   if (clobber_ip)
     {
+      rtx x;
       if (!arm_r3_live_at_start_p () || saved_pretend_args)
-       insn = gen_rtx_REG (SImode, 3);
+       x = gen_rtx_REG (SImode, 3);
       else
        {
-         insn = plus_constant (Pmode, hard_frame_pointer_rtx, 4);
-         insn = gen_frame_mem (SImode, insn);
+         x = plus_constant (Pmode, hard_frame_pointer_rtx, 4);
+         x = gen_frame_mem (SImode, x);
        }
-      emit_set_insn (ip_rtx, insn);
+      emit_set_insn (ip_rtx, x);
       emit_insn (gen_force_register_use (ip_rtx));
     }
 
diff --git a/gcc/config/cris/cris.cc b/gcc/config/cris/cris.cc
index e64ed29de202..67bc0bafd8b1 100644
--- a/gcc/config/cris/cris.cc
+++ b/gcc/config/cris/cris.cc
@@ -2879,7 +2879,8 @@ cris_expand_prologue (void)
   int cfoa_size = crtl->outgoing_args_size;
   int last_movem_reg = -1;
   int framesize = 0;
-  rtx mem, insn;
+  rtx mem;
+  rtx_insn *insn;
   int return_address_on_stack = cris_return_address_on_stack ();
   int n_movem_regs = 0;
   int pretend = crtl->args.pretend_args_size;
diff --git a/gcc/config/lm32/lm32.cc b/gcc/config/lm32/lm32.cc
index 690880b893ed..42d530451d41 100644
--- a/gcc/config/lm32/lm32.cc
+++ b/gcc/config/lm32/lm32.cc
@@ -308,7 +308,7 @@ expand_save_restore (struct lm32_frame_info *info, int op)
   unsigned int reg_save_mask = info->reg_save_mask;
   int regno;
   HOST_WIDE_INT offset;
-  rtx insn;
+  rtx_insn *insn;
 
   /* Callee saves are below locals and above outgoing arguments.  */
   offset = info->args_size + info->callee_size;
@@ -359,7 +359,7 @@ expand_save_restore (struct lm32_frame_info *info, int op)
 static void
 stack_adjust (HOST_WIDE_INT amount)
 {
-  rtx insn;
+  rtx_insn *insn;
 
   if (!IN_RANGE (amount, -32776, 32768))
     {
@@ -387,7 +387,7 @@ stack_adjust (HOST_WIDE_INT amount)
 void
 lm32_expand_prologue (void)
 {
-  rtx insn;
+  rtx_insn *insn;
 
   lm32_compute_frame_size (get_frame_size ());
 
diff --git a/gcc/config/loongarch/loongarch.cc 
b/gcc/config/loongarch/loongarch.cc
index bae6f602bf45..a753171fb8db 100644
--- a/gcc/config/loongarch/loongarch.cc
+++ b/gcc/config/loongarch/loongarch.cc
@@ -1082,7 +1082,7 @@ loongarch_save_reg (rtx reg, rtx mem)
 static void
 loongarch_restore_reg (rtx reg, rtx mem)
 {
-  rtx insn = loongarch_emit_move (reg, mem);
+  rtx_insn *insn = loongarch_emit_move (reg, mem);
   rtx dwarf = NULL_RTX;
   dwarf = alloc_reg_note (REG_CFA_RESTORE, reg, dwarf);
   REG_NOTES (insn) = dwarf;
diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index 618412c825f8..71abb8c0d437 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -9881,7 +9881,7 @@ riscv_save_reg (rtx reg, rtx mem)
 static void
 riscv_restore_reg (rtx reg, rtx mem)
 {
-  rtx insn = riscv_emit_move (reg, mem);
+  rtx_insn *insn = riscv_emit_move (reg, mem);
   rtx dwarf = NULL_RTX;
   dwarf = alloc_reg_note (REG_CFA_RESTORE, reg, dwarf);
 
diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index 246f79b83ab0..c69301bf44ea 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -12318,7 +12318,8 @@ allocate_stack_space (rtx size, HOST_WIDE_INT 
last_probe_offset,
 void
 s390_emit_prologue (void)
 {
-  rtx insn, addr;
+  rtx_insn *insn;
+  rtx addr;
   rtx temp_reg;
   int i;
   int offset;
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index a8a8a355ebad..26a3182a955b 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -1236,7 +1236,7 @@ sh_treg_combine::try_combine_comparisons (cbranch_trace& 
trace,
          log_msg ("replacing comparison and cstore with inverting reg move "
                   "in [bb %d]\n", i->bb->index);
 
-         rtx new_i = make_not_reg_insn (comp_op0, i_comp_op0);
+         rtx_insn *new_i = make_not_reg_insn (comp_op0, i_comp_op0);
          if (REG_P (i_comp_op0)
              && reg_dead_after_insn (i_comp_op0, i->setcc.insn))
            add_reg_note (new_i, REG_DEAD, copy_rtx (i_comp_op0));
diff --git a/gcc/config/stormy16/stormy16.cc b/gcc/config/stormy16/stormy16.cc
index 29011fe6fcf4..a262e1210858 100644
--- a/gcc/config/stormy16/stormy16.cc
+++ b/gcc/config/stormy16/stormy16.cc
@@ -1189,7 +1189,7 @@ xstormy16_expand_prologue (void)
 {
   struct xstormy16_stack_layout layout;
   int regno;
-  rtx insn;
+  rtx_insn *insn;
   rtx mem_push_rtx;
   const int ifun = xstormy16_interrupt_function_p ();
 
diff --git a/gcc/config/visium/visium.cc b/gcc/config/visium/visium.cc
index 99b4f9dd4c4a..2f1e3fd7c0c6 100644
--- a/gcc/config/visium/visium.cc
+++ b/gcc/config/visium/visium.cc
@@ -3776,7 +3776,7 @@ visium_save_regs (int alloc, int offset, int low_regno, 
int high_regno)
     {
       enum reg_type reg_type = GET_REG_TYPE (regno);
       int mask_bit = 1 << (regno - first_regno[reg_type]);
-      rtx insn;
+      rtx_insn *insn;
 
       if (current_frame_info.mask[reg_type] & mask_bit)
        {
@@ -3916,11 +3916,11 @@ visium_expand_prologue (void)
 
       if (alloc_size > 65535)
        {
-         rtx tmp = gen_rtx_REG (SImode, PROLOGUE_TMP_REGNUM), insn;
+         rtx tmp = gen_rtx_REG (SImode, PROLOGUE_TMP_REGNUM);
          emit_insn (gen_movsi (tmp, GEN_INT (alloc_size)));
-         insn = emit_frame_insn (gen_subsi3_flags (stack_pointer_rtx,
-                                                   stack_pointer_rtx,
-                                                   tmp));
+         rtx_insn *insn = emit_frame_insn (gen_subsi3_flags (stack_pointer_rtx,
+                                                             stack_pointer_rtx,
+                                                             tmp));
          add_reg_note (insn, REG_FRAME_RELATED_EXPR,
                        gen_rtx_SET (stack_pointer_rtx,
                                     gen_rtx_PLUS (Pmode, stack_pointer_rtx,
@@ -4108,7 +4108,7 @@ visium_restore_regs (int dealloc, int offset, int 
high_regno, int low_regno)
     }
 
   /* Deallocate the stack space.  */
-  rtx insn = emit_frame_insn (gen_stack_pop (GEN_INT (dealloc)));
+  rtx_insn *insn = emit_frame_insn (gen_stack_pop (GEN_INT (dealloc)));
   add_reg_note (insn, REG_FRAME_RELATED_EXPR,
                gen_rtx_SET (stack_pointer_rtx,
                             gen_rtx_PLUS (Pmode, stack_pointer_rtx,
@@ -4161,7 +4161,8 @@ visium_expand_epilogue (void)
       else
        src = gen_frame_mem (SImode, stack_pointer_rtx);
 
-      rtx insn = emit_frame_insn (gen_movsi (hard_frame_pointer_rtx, src));
+      rtx_insn *insn = emit_frame_insn (gen_movsi (hard_frame_pointer_rtx,
+                                                  src));
       add_reg_note (insn, REG_CFA_ADJUST_CFA,
                    gen_rtx_SET (stack_pointer_rtx,
                                 hard_frame_pointer_rtx));
@@ -4204,7 +4205,7 @@ visium_expand_epilogue (void)
   else if (fsize)
     {
       const int pop_size = reg_size ? local_frame_offset + var_size : fsize;
-      rtx insn;
+      rtx_insn *insn;
 
       if (pop_size > 65535)
        {

Reply via email to