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

commit r17-5235-ga25bea7d0b905e54986db218024e854fe1e24c91
Author: Trevor Saunders <[email protected]>
Date:   Wed Oct 14 14:26:21 2026 +0200

    emit-rtl.cc use rtx_insn * more
    
    gcc/ChangeLog:
    
            * config/csky/csky.cc (csky_legitimize_pic_address): Pass the
            emitted insn to set_unique_reg_note.
            * emit-rtl.cc (set_for_reg_notes): Take an rtx_insn *.
            (set_unique_reg_note): Likewise.
            (set_dst_reg_note): Likewise.
            * rtl.h (set_for_reg_notes): Likewise.
            (set_unique_reg_note): Likewise.
            (set_dst_reg_note): Likewise.

Diff:
---
 gcc/config/csky/csky.cc | 3 +--
 gcc/emit-rtl.cc         | 8 ++++----
 gcc/rtl.h               | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/gcc/config/csky/csky.cc b/gcc/config/csky/csky.cc
index be33a50b806c..f266ad53b5d1 100644
--- a/gcc/config/csky/csky.cc
+++ b/gcc/config/csky/csky.cc
@@ -6126,7 +6126,6 @@ csky_legitimize_pic_address (rtx orig, rtx reg, bool 
gotrel_p)
   if (GET_CODE (orig) == SYMBOL_REF || GET_CODE (orig) == LABEL_REF)
     {
       rtx pic_ref, address, rtx_tmp;
-      rtx insn;
       rtx pic_reg = gen_rtx_REG (SImode, PIC_OFFSET_TABLE_REGNUM);
       int subregs = 0;
 
@@ -6189,7 +6188,7 @@ csky_legitimize_pic_address (rtx orig, rtx reg, bool 
gotrel_p)
            }
        }
 
-      insn = emit_move_insn (reg, pic_ref);
+      rtx_insn *insn = emit_move_insn (reg, pic_ref);
       /* Put a REG_EQUAL note on this insn,
         so that it can be optimized by loop.  */
       if (optimize_p)
diff --git a/gcc/emit-rtl.cc b/gcc/emit-rtl.cc
index cd0e54a2ad52..e33cfa62538f 100644
--- a/gcc/emit-rtl.cc
+++ b/gcc/emit-rtl.cc
@@ -5552,7 +5552,7 @@ gen_use (rtx x)
    have no meaning for INSN.  */
 
 rtx
-set_for_reg_notes (rtx insn)
+set_for_reg_notes (rtx_insn *insn)
 {
   rtx pat, reg;
 
@@ -5591,7 +5591,7 @@ set_for_reg_notes (rtx insn)
    note of this type already exists, remove it first.  */
 
 rtx
-set_unique_reg_note (rtx insn, enum reg_note kind, rtx datum)
+set_unique_reg_note (rtx_insn *insn, enum reg_note kind, rtx datum)
 {
   rtx note = find_reg_note (insn, kind, NULL_RTX);
 
@@ -5633,7 +5633,7 @@ set_unique_reg_note (rtx insn, enum reg_note kind, rtx 
datum)
     {
     case REG_EQUAL:
     case REG_EQUIV:
-      df_notes_rescan (as_a <rtx_insn *> (insn));
+      df_notes_rescan (insn);
       break;
     default:
       break;
@@ -5644,7 +5644,7 @@ set_unique_reg_note (rtx insn, enum reg_note kind, rtx 
datum)
 
 /* Like set_unique_reg_note, but don't do anything unless INSN sets DST.  */
 rtx
-set_dst_reg_note (rtx insn, enum reg_note kind, rtx datum, rtx dst)
+set_dst_reg_note (rtx_insn *insn, enum reg_note kind, rtx datum, rtx dst)
 {
   rtx set = set_for_reg_notes (insn);
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 90e7630108de..4f779d924f89 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -3681,9 +3681,9 @@ extern machine_mode choose_hard_reg_mode (unsigned int, 
unsigned int,
 extern const HARD_REG_SET &simplifiable_subregs (const subreg_shape &);
 
 /* In emit-rtl.cc  */
-extern rtx set_for_reg_notes (rtx);
-extern rtx set_unique_reg_note (rtx, enum reg_note, rtx);
-extern rtx set_dst_reg_note (rtx, enum reg_note, rtx, rtx);
+extern rtx set_for_reg_notes (rtx_insn *);
+extern rtx set_unique_reg_note (rtx_insn *, enum reg_note, rtx);
+extern rtx set_dst_reg_note (rtx_insn *, enum reg_note, rtx, rtx);
 extern void set_insn_deleted (rtx_insn *);
 
 /* Functions in rtlanal.cc */

Reply via email to