https://gcc.gnu.org/g:78a34222c6368cfab3e750427f8354a3176e4d6d
commit r17-5864-g78a34222c6368cfab3e750427f8354a3176e4d6d Author: Trevor Saunders <[email protected]> Date: Wed Oct 28 03:18:10 2026 +0000 Use add_reg_note instead of a hand-built note gcc/ChangeLog: * config/arm/arm.cc (arm_emit_multi_reg_pop, arm_emit_ldrd_pop, arm_expand_epilogue): Use add_reg_note. * config/cris/cris.cc (cris_split_movdx, cris_expand_epilogue): Likewise. * config/frv/frv.cc (frv_frame_insn): Likewise. * config/loongarch/loongarch.cc (loongarch_set_frame_expr, loongarch_restore_reg): Likewise. * config/riscv/riscv.cc (riscv_set_frame_expr): Likewise. * config/stormy16/stormy16.cc (xstormy16_split_move): Likewise. Diff: --- gcc/config/arm/arm.cc | 28 +++++++--------------------- gcc/config/cris/cris.cc | 31 +++++++++---------------------- gcc/config/frv/frv.cc | 4 +--- gcc/config/loongarch/loongarch.cc | 7 ++----- gcc/config/riscv/riscv.cc | 4 +--- gcc/config/stormy16/stormy16.cc | 4 +--- 6 files changed, 21 insertions(+), 57 deletions(-) diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index fedae2db85b4..2a8254c366ed 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -21564,8 +21564,7 @@ arm_emit_multi_reg_pop (unsigned long saved_regs_mask) gen_rtx_POST_INC (Pmode, stack_pointer_rtx)); rtx_insn *insn = emit_insn (gen_rtx_SET (reg, tmp)); - REG_NOTES (insn) = alloc_reg_note (REG_CFA_RESTORE, dwarf_reg, - dwarf); + add_reg_note (insn, REG_CFA_RESTORE, dwarf_reg); arm_add_cfa_adjust_cfa_note (insn, UNITS_PER_WORD, stack_pointer_rtx, stack_pointer_rtx); return; @@ -21863,7 +21862,6 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) int j = 0; int offset = 0; rtx par = NULL_RTX; - rtx dwarf = NULL_RTX; rtx tmp, mem; /* Restore saved registers. */ @@ -21893,14 +21891,8 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) /* Generate dwarf info. */ - dwarf = alloc_reg_note (REG_CFA_RESTORE, - gen_rtx_REG (SImode, j), - NULL_RTX); - dwarf = alloc_reg_note (REG_CFA_RESTORE, - gen_rtx_REG (SImode, j + 1), - dwarf); - - REG_NOTES (insn) = dwarf; + add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (SImode, j)); + add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (SImode, j + 1)); offset += 8; j += 2; @@ -21921,9 +21913,7 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) RTX_FRAME_RELATED_P (insn) = 1; /* Generate dwarf info. */ - REG_NOTES (insn) = alloc_reg_note (REG_CFA_RESTORE, - gen_rtx_REG (SImode, j), - NULL_RTX); + add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (SImode, j)); offset += 4; j += 1; @@ -21961,10 +21951,7 @@ arm_emit_ldrd_pop (unsigned long saved_regs_mask) rtx_insn *insn = emit_jump_insn (par); /* Generate dwarf info. */ - dwarf = alloc_reg_note (REG_CFA_RESTORE, - gen_rtx_REG (SImode, PC_REGNUM), - NULL_RTX); - REG_NOTES (insn) = dwarf; + add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (SImode, PC_REGNUM)); arm_add_cfa_adjust_cfa_note (insn, UNITS_PER_WORD, stack_pointer_rtx, stack_pointer_rtx); } @@ -27136,9 +27123,8 @@ arm_expand_epilogue (bool really_return) rtx_insn *move = emit_insn (gen_movsi (gen_rtx_REG (SImode, i), addr)); - REG_NOTES (move) = alloc_reg_note (REG_CFA_RESTORE, - gen_rtx_REG (SImode, i), - NULL_RTX); + add_reg_note (move, REG_CFA_RESTORE, + gen_rtx_REG (SImode, i)); arm_add_cfa_adjust_cfa_note (move, UNITS_PER_WORD, stack_pointer_rtx, stack_pointer_rtx); diff --git a/gcc/config/cris/cris.cc b/gcc/config/cris/cris.cc index e10f0ad1e97a..de425f68cad4 100644 --- a/gcc/config/cris/cris.cc +++ b/gcc/config/cris/cris.cc @@ -2610,16 +2610,12 @@ cris_split_movdx (rtx *operands) = emit_move_insn (operand_subword (dest, 0, TRUE, mode), mem); if (GET_CODE (XEXP (mem, 0)) == POST_INC) - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, XEXP (XEXP (mem, 0), 0), - REG_NOTES (insn)); + add_reg_note (insn, REG_INC, XEXP (XEXP (mem, 0), 0)); mem = copy_rtx (mem); insn = emit_move_insn (operand_subword (dest, 1, TRUE, mode), mem); if (GET_CODE (XEXP (mem, 0)) == POST_INC) - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, XEXP (XEXP (mem, 0), 0), - REG_NOTES (insn)); + add_reg_note (insn, REG_INC, XEXP (XEXP (mem, 0), 0)); } else { @@ -2664,16 +2660,12 @@ cris_split_movdx (rtx *operands) rtx_insn *insn = emit_move_insn (mem, operand_subword (src, 0, TRUE, mode)); if (GET_CODE (XEXP (mem, 0)) == POST_INC) - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, XEXP (XEXP (mem, 0), 0), - REG_NOTES (insn)); + add_reg_note (insn, REG_INC, XEXP (XEXP (mem, 0), 0)); mem = copy_rtx (mem); insn = emit_move_insn (mem, operand_subword (src, 1, TRUE, mode)); if (GET_CODE (XEXP (mem, 0)) == POST_INC) - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, XEXP (XEXP (mem, 0), 0), - REG_NOTES (insn)); + add_reg_note (insn, REG_INC, XEXP (XEXP (mem, 0), 0)); } else { @@ -3179,8 +3171,7 @@ cris_expand_epilogue (void) /* Whenever we emit insns with post-incremented addresses ourselves, we must add a post-inc note manually. */ - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, stack_pointer_rtx, REG_NOTES (insn)); + add_reg_note (insn, REG_INC, stack_pointer_rtx); } /* If we have any movem-restore, do it now. */ @@ -3201,8 +3192,7 @@ cris_expand_epilogue (void) /* Whenever we emit insns with post-incremented addresses ourselves, we must add a post-inc note manually. */ if (side_effects_p (PATTERN (insn))) - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, stack_pointer_rtx, REG_NOTES (insn)); + add_reg_note (insn, REG_INC, stack_pointer_rtx); } /* If we don't clobber all of the allocated stack area (we've already @@ -3229,8 +3219,7 @@ cris_expand_epilogue (void) /* Whenever we emit insns with post-incremented addresses ourselves, we must add a post-inc note manually. */ - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, stack_pointer_rtx, REG_NOTES (insn)); + add_reg_note (insn, REG_INC, stack_pointer_rtx); } else if ((size + argspace_offset) != 0) { @@ -3263,8 +3252,7 @@ cris_expand_epilogue (void) /* Whenever we emit insns with post-incremented addresses ourselves, we must add a post-inc note manually. */ - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, stack_pointer_rtx, REG_NOTES (insn)); + add_reg_note (insn, REG_INC, stack_pointer_rtx); if (crtl->calls_eh_return) emit_insn (gen_add2_insn (stack_pointer_rtx, @@ -3295,8 +3283,7 @@ cris_expand_epilogue (void) /* Whenever we emit insns with post-incremented addresses ourselves, we must add a post-inc note manually. */ - REG_NOTES (insn) - = alloc_EXPR_LIST (REG_INC, stack_pointer_rtx, REG_NOTES (insn)); + add_reg_note (insn, REG_INC, stack_pointer_rtx); } emit_insn (gen_add2_insn (stack_pointer_rtx, GEN_INT (pretend))); diff --git a/gcc/config/frv/frv.cc b/gcc/config/frv/frv.cc index 17b0881d37cd..a1c75d731c87 100644 --- a/gcc/config/frv/frv.cc +++ b/gcc/config/frv/frv.cc @@ -1559,9 +1559,7 @@ frv_frame_insn (rtx pattern, rtx dwarf_pattern) { rtx_insn *insn = emit_insn (pattern); RTX_FRAME_RELATED_P (insn) = 1; - REG_NOTES (insn) = alloc_EXPR_LIST (REG_FRAME_RELATED_EXPR, - dwarf_pattern, - REG_NOTES (insn)); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf_pattern); } /* Emit instructions that transfer REG to or from the memory location (sp + diff --git a/gcc/config/loongarch/loongarch.cc b/gcc/config/loongarch/loongarch.cc index a753171fb8db..bf4016023942 100644 --- a/gcc/config/loongarch/loongarch.cc +++ b/gcc/config/loongarch/loongarch.cc @@ -801,8 +801,7 @@ loongarch_set_frame_expr (rtx frame_pattern) { rtx_insn *insn = get_last_insn (); RTX_FRAME_RELATED_P (insn) = 1; - REG_NOTES (insn) = alloc_EXPR_LIST (REG_FRAME_RELATED_EXPR, frame_pattern, - REG_NOTES (insn)); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, frame_pattern); } /* Return a frame-related rtx that stores REG at MEM. @@ -1083,9 +1082,7 @@ static void loongarch_restore_reg (rtx reg, rtx 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; + add_reg_note (insn, REG_CFA_RESTORE, reg); RTX_FRAME_RELATED_P (insn) = 1; } diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 5484d7487799..7aca11d4daac 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -9298,9 +9298,7 @@ riscv_set_frame_expr (rtx frame_pattern) { rtx_insn *insn = get_last_insn (); RTX_FRAME_RELATED_P (insn) = 1; - REG_NOTES (insn) = alloc_EXPR_LIST (REG_FRAME_RELATED_EXPR, - frame_pattern, - REG_NOTES (insn)); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, frame_pattern); } /* Return a frame-related rtx that stores REG at MEM. diff --git a/gcc/config/stormy16/stormy16.cc b/gcc/config/stormy16/stormy16.cc index 536c58d89446..65451d86632d 100644 --- a/gcc/config/stormy16/stormy16.cc +++ b/gcc/config/stormy16/stormy16.cc @@ -986,9 +986,7 @@ xstormy16_split_move (machine_mode mode, rtx dest, rtx src) rtx_insn *insn = emit_insn (gen_rtx_SET (w_dest, w_src)); if (auto_inc_reg_rtx) - REG_NOTES (insn) = alloc_EXPR_LIST (REG_INC, - auto_inc_reg_rtx, - REG_NOTES (insn)); + add_reg_note (insn, REG_INC, auto_inc_reg_rtx); } }
