https://gcc.gnu.org/g:fa8d8dfca73ee82720c90a9daad5c573fc2a3c8f

commit r17-5856-gfa8d8dfca73ee82720c90a9daad5c573fc2a3c8f
Author: Trevor Saunders <[email protected]>
Date:   Sat Oct 24 22:49:05 2026 +0000

    Hold emitted insns in rtx_insn * locals
    
    gcc/ChangeLog:
    
            * config/arc/arc.cc (arc_save_callee_enter,
            arc_save_callee_milli): Hold the emitted insn in an rtx_insn *.
            * config/arm/arm.cc (arm_emit_multi_reg_pop): Likewise.
            * config/msp430/msp430.cc (F, msp430_expand_prologue,
            msp430_expand_epilogue): Likewise.
            * config/riscv/riscv.cc (riscv_v_adjust_scalable_frame,
            riscv_allocate_and_probe_stack_space): Likewise.
            * config/rl78/rl78.cc (F, rl78_expand_prologue): Likewise.
            * config/s390/s390.cc (s390_emit_epilogue): Likewise.
            * config/sh/sh_treg_combine.cc (try_combine_comparisons):
            Likewise.

Diff:
---
 gcc/config/arc/arc.cc            | 40 ++++++++++++++++++++--------------------
 gcc/config/arm/arm.cc            |  8 ++++----
 gcc/config/msp430/msp430.cc      | 11 +++++++++--
 gcc/config/riscv/riscv.cc        | 13 ++++++++-----
 gcc/config/rl78/rl78.cc          |  8 +++-----
 gcc/config/s390/s390.cc          | 19 ++++++++++---------
 gcc/config/sh/sh_treg_combine.cc | 18 ++++++++++--------
 7 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc
index 4bcabb3c7ebe..bcd85b4e1b0d 100644
--- a/gcc/config/arc/arc.cc
+++ b/gcc/config/arc/arc.cc
@@ -3273,7 +3273,7 @@ arc_save_callee_enter (uint64_t gmask,
   int start_reg = ENTER_LEAVE_START_REG;
   int end_reg = ENTER_LEAVE_END_REG;
   int regno, indx, off, nregs;
-  rtx insn, reg, mem;
+  rtx reg, mem;
   int frame_allocated = 0;
 
   for (regno = start_reg; regno <= end_reg && (gmask & (1ULL << regno));)
@@ -3287,8 +3287,8 @@ arc_save_callee_enter (uint64_t gmask,
   if (offset)
     frame_stack_add (offset);
 
-  insn = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (nregs + (save_fp ? 1 : 0)
-                                                 + 1));
+  rtx body = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (nregs + (save_fp ? 1 : 0)
+                                                     + 1));
   indx = 0;
 
   reg = gen_rtx_SET (stack_pointer_rtx,
@@ -3296,7 +3296,7 @@ arc_save_callee_enter (uint64_t gmask,
                                    stack_pointer_rtx,
                                    -nregs * UNITS_PER_WORD));
   RTX_FRAME_RELATED_P (reg) = 1;
-  XVECEXP (insn, 0, indx++) = reg;
+  XVECEXP (body, 0, indx++) = reg;
   off = nregs * UNITS_PER_WORD;
 
   if (save_blink)
@@ -3305,8 +3305,8 @@ arc_save_callee_enter (uint64_t gmask,
       mem = gen_frame_mem (Pmode, plus_constant (Pmode,
                                                 stack_pointer_rtx,
                                                 -off));
-      XVECEXP (insn, 0, indx) = gen_rtx_SET (mem, reg);
-      RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx++)) = 1;
+      XVECEXP (body, 0, indx) = gen_rtx_SET (mem, reg);
+      RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx++)) = 1;
       off -= UNITS_PER_WORD;
       save_blink = false;
     }
@@ -3319,8 +3319,8 @@ arc_save_callee_enter (uint64_t gmask,
       mem = gen_frame_mem (SImode, plus_constant (Pmode,
                                                  stack_pointer_rtx,
                                                  -off));
-      XVECEXP (insn, 0, indx) = gen_rtx_SET (mem, reg);
-      RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx)) = 1;
+      XVECEXP (body, 0, indx) = gen_rtx_SET (mem, reg);
+      RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx)) = 1;
       gmask = gmask & ~(1ULL << regno);
     }
 
@@ -3329,18 +3329,18 @@ arc_save_callee_enter (uint64_t gmask,
       mem = gen_frame_mem (Pmode, plus_constant (Pmode,
                                                 stack_pointer_rtx,
                                                 -off));
-      XVECEXP (insn, 0, indx) = gen_rtx_SET (mem, hard_frame_pointer_rtx);
-      RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx++)) = 1;
+      XVECEXP (body, 0, indx) = gen_rtx_SET (mem, hard_frame_pointer_rtx);
+      RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx++)) = 1;
       off -= UNITS_PER_WORD;
 
-      XVECEXP (insn, 0, indx) = gen_rtx_SET (hard_frame_pointer_rtx,
+      XVECEXP (body, 0, indx) = gen_rtx_SET (hard_frame_pointer_rtx,
                                             stack_pointer_rtx);
-      RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx++)) = 1;
+      RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx++)) = 1;
       save_fp = false;
     }
 
   gcc_assert (off == 0);
-  insn = frame_insn (insn);
+  rtx_insn *insn = frame_insn (body);
 
   add_reg_note (insn, REG_INC, stack_pointer_rtx);
 
@@ -3502,7 +3502,7 @@ arc_save_callee_milli (uint64_t gmask,
   int start_reg = 13;
   int end_reg = 25;
   int regno, indx, off, nregs;
-  rtx insn, reg, mem;
+  rtx body, reg, mem;
   int frame_allocated = 0;
 
   for (regno = start_reg; regno <= end_reg && (gmask & (1ULL << regno));)
@@ -3531,12 +3531,12 @@ arc_save_callee_milli (uint64_t gmask,
     }
 
   /* Start generate millicode call.  */
-  insn = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (nregs + 1));
+  body = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (nregs + 1));
   indx = 0;
 
   /* This is a call, we clobber blink.  */
-  XVECEXP (insn, 0, nregs) =
-    gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM));
+  XVECEXP (body, 0, nregs)
+    = gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, RETURN_ADDR_REGNUM));
 
   for (regno = start_reg, indx = 0, off = 0;
        regno <= end_reg;
@@ -3546,11 +3546,11 @@ arc_save_callee_milli (uint64_t gmask,
       mem = gen_frame_mem (SImode, plus_constant (Pmode,
                                                  stack_pointer_rtx,
                                                  off));
-      XVECEXP (insn, 0, indx) = gen_rtx_SET (mem, reg);
-      RTX_FRAME_RELATED_P (XVECEXP (insn, 0, indx)) = 1;
+      XVECEXP (body, 0, indx) = gen_rtx_SET (mem, reg);
+      RTX_FRAME_RELATED_P (XVECEXP (body, 0, indx)) = 1;
       gmask = gmask & ~(1ULL << regno);
     }
-  insn = frame_insn (insn);
+  rtx_insn *insn = frame_insn (body);
 
   /* Add DWARF info.  */
   for (regno = start_reg, off = 0;
diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc
index d0275729dc81..2df966d129fc 100644
--- a/gcc/config/arm/arm.cc
+++ b/gcc/config/arm/arm.cc
@@ -21563,10 +21563,10 @@ arm_emit_multi_reg_pop (unsigned long saved_regs_mask)
       tmp = gen_frame_mem (SImode,
                           gen_rtx_POST_INC (Pmode,
                                             stack_pointer_rtx));
-      tmp = emit_insn (gen_rtx_SET (reg, tmp));
-      REG_NOTES (tmp) = alloc_reg_note (REG_CFA_RESTORE, dwarf_reg,
-                                       dwarf);
-      arm_add_cfa_adjust_cfa_note (tmp, UNITS_PER_WORD,
+      rtx_insn *insn = emit_insn (gen_rtx_SET (reg, tmp));
+      REG_NOTES (insn) = alloc_reg_note (REG_CFA_RESTORE, dwarf_reg,
+                                        dwarf);
+      arm_add_cfa_adjust_cfa_note (insn, UNITS_PER_WORD,
                                   stack_pointer_rtx, stack_pointer_rtx);
       return;
     }
diff --git a/gcc/config/msp430/msp430.cc b/gcc/config/msp430/msp430.cc
index bf9fdcba7c8f..a46a4a96f3d1 100644
--- a/gcc/config/msp430/msp430.cc
+++ b/gcc/config/msp430/msp430.cc
@@ -1707,6 +1707,13 @@ msp430_insn_cost (rtx_insn *insn, bool speed 
ATTRIBUTE_UNUSED)
 
 /* We use this to wrap all emitted insns in the prologue, so they get
    the "frame-related" (/f) flag set.  */
+static rtx_insn *
+F (rtx_insn *x)
+{
+  RTX_FRAME_RELATED_P (x) = 1;
+  return x;
+}
+
 static rtx
 F (rtx x)
 {
@@ -2886,7 +2893,7 @@ msp430_expand_prologue (void)
      that there is a single rtx representing the stack pointer,
      namely stack_pointer_rtx, and uses == to recognize it.  */
   rtx sp = stack_pointer_rtx;
-  rtx p;
+  rtx_insn *p;
 
   if (is_naked_func ())
     {
@@ -3007,7 +3014,7 @@ msp430_expand_epilogue (int is_eh)
   int i, j;
   int fs;
   rtx sp = stack_pointer_rtx;
-  rtx p;
+  rtx_insn *p;
   int helper_n = 0;
 
   if (is_naked_func ())
diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index 71abb8c0d437..5484d7487799 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -10371,7 +10371,8 @@ riscv_v_adjust_scalable_frame (rtx target, poly_int64 
offset, bool epilogue)
 {
   rtx tmp = RISCV_PROLOGUE_TEMP (Pmode);
   rtx adjust_size = RISCV_PROLOGUE_TEMP2 (Pmode);
-  rtx insn, dwarf, adjust_frame_rtx;
+  rtx dwarf, adjust_frame_rtx;
+  rtx_insn *insn;
 
   riscv_legitimize_poly_move (Pmode, adjust_size, tmp,
                              gen_int_mode (offset, Pmode));
@@ -10432,12 +10433,13 @@ riscv_v_adjust_scalable_frame (rtx target, poly_int64 
offset, bool epilogue)
       return;
     }
 
+  rtx pat;
   if (epilogue)
-    insn = gen_add3_insn (target, target, adjust_size);
+    pat = gen_add3_insn (target, target, adjust_size);
   else
-    insn = gen_sub3_insn (target, target, adjust_size);
+    pat = gen_sub3_insn (target, target, adjust_size);
 
-  insn = emit_insn (insn);
+  insn = emit_insn (pat);
 
   RTX_FRAME_RELATED_P (insn) = 1;
 
@@ -10581,7 +10583,8 @@ riscv_allocate_and_probe_stack_space (rtx temp1, 
HOST_WIDE_INT size)
       /* Compute the ending address.  */
       rtx temp2 = gen_rtx_REG (Pmode, RISCV_PROLOGUE_TEMP2_REGNUM);
       temp2 = riscv_force_temporary (temp2, gen_int_mode (rounded_size, 
Pmode));
-      insn = emit_insn (gen_sub3_insn (temp2, stack_pointer_rtx, temp2));
+      rtx_insn *insn
+       = emit_insn (gen_sub3_insn (temp2, stack_pointer_rtx, temp2));
 
       /* The size does not represent actual stack pointer address shift
         from the top of the frame, as it might be lowered before.
diff --git a/gcc/config/rl78/rl78.cc b/gcc/config/rl78/rl78.cc
index 193a5fa080b2..dffb06095d23 100644
--- a/gcc/config/rl78/rl78.cc
+++ b/gcc/config/rl78/rl78.cc
@@ -746,8 +746,8 @@ need_to_save (unsigned int regno)
 }
 
 /* We use this to wrap all emitted insns in the prologue.  */
-static rtx
-F (rtx x)
+static rtx_insn *
+F (rtx_insn *x)
 {
   RTX_FRAME_RELATED_P (x) = 1;
   return x;
@@ -1474,11 +1474,9 @@ rl78_expand_prologue (void)
         smaller to move SP into AX and perform the subtraction there.  */
       if (fs > 254 * 3)
        {
-         rtx insn;
-
          emit_move_insn (ax, sp);
          emit_insn (gen_subhi3 (ax, ax, GEN_INT (fs)));
-         insn = F (emit_move_insn (sp, ax));
+         rtx_insn *insn = F (emit_move_insn (sp, ax));
          add_reg_note (insn, REG_FRAME_RELATED_EXPR,
                        gen_rtx_SET (sp, gen_rtx_PLUS (HImode, sp,
                                                       GEN_INT (-fs))));
diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index a7ba415f930f..cf174cf1b578 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -12727,7 +12727,8 @@ s390_emit_epilogue (bool sibcall)
 
   if (cfun_frame_layout.first_restore_gpr != -1)
     {
-      rtx insn, addr;
+      rtx addr;
+      rtx_insn *insn;
       int i;
 
       /* Check for global register and save them
@@ -12794,14 +12795,14 @@ s390_emit_epilogue (bool sibcall)
          cfun_frame_layout.save_return_addr_p = true;
        }
 
-      insn = restore_gprs (frame_pointer,
-                          offset + cfun_frame_layout.gprs_offset
-                          + (cfun_frame_layout.first_restore_gpr
-                             - cfun_frame_layout.first_save_gpr_slot)
-                          * UNITS_PER_WORD,
-                          cfun_frame_layout.first_restore_gpr,
-                          cfun_frame_layout.last_restore_gpr);
-      insn = emit_insn (insn);
+      rtx pat = restore_gprs (frame_pointer,
+                             offset + cfun_frame_layout.gprs_offset
+                             + (cfun_frame_layout.first_restore_gpr
+                                - cfun_frame_layout.first_save_gpr_slot)
+                             * UNITS_PER_WORD,
+                             cfun_frame_layout.first_restore_gpr,
+                             cfun_frame_layout.last_restore_gpr);
+      insn = emit_insn (pat);
       REG_NOTES (insn) = cfa_restores;
       add_reg_note (insn, REG_CFA_DEF_CFA,
                    plus_constant (Pmode, stack_pointer_rtx,
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index ea5b92c263ae..13efadcc1bb3 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -1186,8 +1186,9 @@ sh_treg_combine::try_combine_comparisons (cbranch_trace& 
trace,
   log_rtx (common_comp_pat);
   log_msg ("\n");
 
-  rtx common_comp_insn = touched_insn (emit_insn_after (common_comp_pat,
-                                                       trace.setcc.insn));
+  rtx_insn *common_comp_insn
+    = emit_insn_after (common_comp_pat, trace.setcc.insn);
+  touched_insn (common_comp_insn);
 
   if (REG_P (comp_op0))
     add_reg_note (common_comp_insn, REG_DEAD, copy_rtx (comp_op0));
@@ -1211,9 +1212,10 @@ sh_treg_combine::try_combine_comparisons (cbranch_trace& 
trace,
          log_msg ("replacing comparison and cstore with reg move "
                   "in [bb %d]\n", i->bb->index);
 
-         rtx new_i = touched_insn (
-               emit_insn_after (gen_move_insn (comp_op0, i_comp_op0),
-                                i->setcc.insn));
+         rtx_insn *new_i
+           = emit_insn_after (gen_move_insn (comp_op0, i_comp_op0),
+                              i->setcc.insn);
+         touched_insn (new_i);
 
          if (REG_P (i_comp_op0)
              && reg_dead_after_insn (i_comp_op0, i->setcc.insn))
@@ -1223,9 +1225,9 @@ sh_treg_combine::try_combine_comparisons (cbranch_trace& 
trace,
          // Otherwise assume it's a const_int and just reference it.
          if (REG_P (comp_op1))
            {
-             new_i = touched_insn (
-                 emit_insn_after (gen_move_insn (comp_op1, i_comp_op1),
-                                  i->setcc.insn));
+             new_i = emit_insn_after (gen_move_insn (comp_op1, i_comp_op1),
+                                      i->setcc.insn);
+             touched_insn (new_i);
 
              if (reg_dead_after_insn (i_comp_op1, i->setcc.insn))
                add_reg_note (new_i, REG_DEAD, copy_rtx (i_comp_op1));

Reply via email to