https://gcc.gnu.org/g:398868edb7523965e38f75025803894f8210d9c3

commit r17-5865-g398868edb7523965e38f75025803894f8210d9c3
Author: Trevor Saunders <[email protected]>
Date:   Wed Oct 28 03:47:03 2026 +0000

    Pass an rtx_insn * to add_reg_note
    
    gcc/ChangeLog:
    
            * rtl.h (add_reg_note): Take an rtx_insn *.
            * rtlanal.cc (add_reg_note): Likewise.
            * config/rl78/rl78.cc (gen_and_emit_move): Pass an rtx_insn *.
            * config/s390/s390.cc (save_gprs): Likewise.

Diff:
---
 gcc/config/rl78/rl78.cc |  3 ++-
 gcc/config/s390/s390.cc | 12 +++++++-----
 gcc/rtl.h               |  2 +-
 gcc/rtlanal.cc          |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/gcc/config/rl78/rl78.cc b/gcc/config/rl78/rl78.cc
index 56976aab3535..9ad7f2da0515 100644
--- a/gcc/config/rl78/rl78.cc
+++ b/gcc/config/rl78/rl78.cc
@@ -2929,7 +2929,8 @@ gen_and_emit_move (rtx to, rtx from, rtx_insn *where, 
bool before)
             cf. compiling gcc.dg/pr44545.c.  */
          if (note != NULL_RTX)
            {
-             add_reg_note (move, REG_EH_REGION, XEXP (note, 0));
+             add_reg_note (as_a <rtx_insn *> (move), REG_EH_REGION,
+                           XEXP (note, 0));
              remove_note (where, note);
            }
 
diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index 559db8bb2538..6fa5f7706f9c 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -11799,7 +11799,8 @@ restore_fpr (rtx base, int offset, int regnum)
 static void
 save_gprs (rtx base, int offset, int first, int last, rtx_insn *before = NULL)
 {
-  rtx addr, insn, note;
+  rtx addr, note;
+  rtx_insn *insn;
   rtx_insn *out_insn;
   int i;
 
@@ -11809,7 +11810,8 @@ save_gprs (rtx base, int offset, int first, int last, 
rtx_insn *before = NULL)
   /* Special-case single register.  */
   if (first == last)
     {
-      insn = gen_movdi (addr, gen_rtx_REG (Pmode, first));
+      insn = as_a <rtx_insn *> (gen_movdi (addr,
+                                          gen_rtx_REG (Pmode, first)));
 
       if (!global_not_special_regno_p (first))
        RTX_FRAME_RELATED_P (insn) = 1;
@@ -11825,9 +11827,9 @@ save_gprs (rtx base, int offset, int first, int last, 
rtx_insn *before = NULL)
     }
 
 
-  insn = gen_store_multiple (addr,
-                            gen_rtx_REG (Pmode, first),
-                            GEN_INT (last - first + 1));
+  insn = as_a <rtx_insn *> (gen_store_multiple (addr,
+                                               gen_rtx_REG (Pmode, first),
+                                               GEN_INT (last - first + 1)));
 
   if (first <= 6 && cfun->stdarg)
     for (i = 0; i < XVECLEN (PATTERN (insn), 0); i++)
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 0c4c69ff4248..24727a683557 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -3769,7 +3769,7 @@ extern rtx find_constant_src (const rtx_insn *);
 extern bool find_reg_fusage (const_rtx, enum rtx_code, const_rtx);
 extern bool find_regno_fusage (const_rtx, enum rtx_code, unsigned int);
 extern rtx alloc_reg_note (enum reg_note, rtx, rtx);
-extern void add_reg_note (rtx, enum reg_note, rtx);
+extern void add_reg_note (rtx_insn *, enum reg_note, rtx);
 extern void add_int_reg_note (rtx_insn *, enum reg_note, int);
 extern void add_args_size_note (rtx_insn *, poly_int64);
 extern void add_shallow_copy_of_reg_note (rtx_insn *, rtx);
diff --git a/gcc/rtlanal.cc b/gcc/rtlanal.cc
index bd959e07aaf3..24fcbbea555b 100644
--- a/gcc/rtlanal.cc
+++ b/gcc/rtlanal.cc
@@ -2734,7 +2734,7 @@ alloc_reg_note (enum reg_note kind, rtx datum, rtx list)
 /* Add register note with kind KIND and datum DATUM to INSN.  */
 
 void
-add_reg_note (rtx insn, enum reg_note kind, rtx datum)
+add_reg_note (rtx_insn *insn, enum reg_note kind, rtx datum)
 {
   REG_NOTES (insn) = alloc_reg_note (kind, datum, REG_NOTES (insn));
 }

Reply via email to