https://gcc.gnu.org/g:e11ca9bc8c444b2a2fb12f8c1c2e4e203adeb39a
commit r16-685-ge11ca9bc8c444b2a2fb12f8c1c2e4e203adeb39a Author: Richard Sandiford <richard.sandif...@arm.com> Date: Fri May 16 13:24:02 2025 +0100 Automatic replacement of end_sequence/return pairs This is the result of using a regexp to replace: rtx( |_insn *)<stuff> = end_sequence (); return <stuff>; with: return end_sequence (); gcc/ * asan.cc (asan_emit_allocas_unpoison): Directly return the result of end_sequence. (hwasan_emit_untag_frame): Likewise. * config/aarch64/aarch64-speculation.cc (aarch64_speculation_clobber_sp): Likewise. (aarch64_speculation_establish_tracker): Likewise. * config/arm/arm.cc (arm_call_tls_get_addr): Likewise. * config/avr/avr-passes.cc (avr_parallel_insn_from_insns): Likewise. * config/sh/sh_treg_combine.cc (sh_treg_combine::make_not_reg_insn): Likewise. * tree-outof-ssa.cc (emit_partition_copy): Likewise. Diff: --- gcc/asan.cc | 6 ++---- gcc/config/aarch64/aarch64-speculation.cc | 6 ++---- gcc/config/arm/arm.cc | 4 +--- gcc/config/avr/avr-passes.cc | 4 +--- gcc/config/sh/sh_treg_combine.cc | 4 +--- gcc/tree-outof-ssa.cc | 4 +--- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/gcc/asan.cc b/gcc/asan.cc index dfb044c08b7b..748b289d6f90 100644 --- a/gcc/asan.cc +++ b/gcc/asan.cc @@ -2304,8 +2304,7 @@ asan_emit_allocas_unpoison (rtx top, rtx bot, rtx_insn *before) top, ptr_mode, bot, ptr_mode); do_pending_stack_adjust (); - rtx_insn *insns = end_sequence (); - return insns; + return end_sequence (); } /* Return true if DECL, a global var, might be overridden and needs @@ -4737,8 +4736,7 @@ hwasan_emit_untag_frame (rtx dynamic, rtx vars) size_rtx, ptr_mode); do_pending_stack_adjust (); - rtx_insn *insns = end_sequence (); - return insns; + return end_sequence (); } /* Needs to be GTY(()), because cgraph_build_static_cdtor may diff --git a/gcc/config/aarch64/aarch64-speculation.cc b/gcc/config/aarch64/aarch64-speculation.cc index 5bcbfad2c133..618045afbc1f 100644 --- a/gcc/config/aarch64/aarch64-speculation.cc +++ b/gcc/config/aarch64/aarch64-speculation.cc @@ -160,8 +160,7 @@ aarch64_speculation_clobber_sp () emit_insn (gen_rtx_SET (scratch, sp)); emit_insn (gen_anddi3 (scratch, scratch, tracker)); emit_insn (gen_rtx_SET (sp, scratch)); - rtx_insn *seq = end_sequence (); - return seq; + return end_sequence (); } /* Generate a code sequence to establish the tracker variable from the @@ -175,8 +174,7 @@ aarch64_speculation_establish_tracker () rtx cc = aarch64_gen_compare_reg (EQ, sp, const0_rtx); emit_insn (gen_cstoredi_neg (tracker, gen_rtx_NE (CCmode, cc, const0_rtx), cc)); - rtx_insn *seq = end_sequence (); - return seq; + return end_sequence (); } /* Main speculation tracking pass. */ diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index 60c961ab272b..94624cc87a42 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -9278,9 +9278,7 @@ arm_call_tls_get_addr (rtx x, rtx reg, rtx *valuep, int reloc) LCT_PURE, /* LCT_CONST? */ Pmode, reg, Pmode); - rtx_insn *insns = end_sequence (); - - return insns; + return end_sequence (); } static rtx diff --git a/gcc/config/avr/avr-passes.cc b/gcc/config/avr/avr-passes.cc index 55785b8b7000..284f49d14680 100644 --- a/gcc/config/avr/avr-passes.cc +++ b/gcc/config/avr/avr-passes.cc @@ -3942,9 +3942,7 @@ avr_parallel_insn_from_insns (rtx_insn *i[5]) PATTERN (i[3]), PATTERN (i[4])); start_sequence (); emit (gen_rtx_PARALLEL (VOIDmode, vec)); - rtx_insn *insn = end_sequence (); - - return insn; + return end_sequence (); } diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc index 33f528e0b760..696fe328a12d 100644 --- a/gcc/config/sh/sh_treg_combine.cc +++ b/gcc/config/sh/sh_treg_combine.cc @@ -945,9 +945,7 @@ sh_treg_combine::make_not_reg_insn (rtx dst_reg, rtx src_reg) const else gcc_unreachable (); - rtx i = end_sequence (); - - return i; + return end_sequence (); } rtx_insn * diff --git a/gcc/tree-outof-ssa.cc b/gcc/tree-outof-ssa.cc index d7e9ddbd0826..bdf474dbd936 100644 --- a/gcc/tree-outof-ssa.cc +++ b/gcc/tree-outof-ssa.cc @@ -264,9 +264,7 @@ emit_partition_copy (rtx dest, rtx src, int unsignedsrcp, tree sizeexp) emit_move_insn (dest, src); do_pending_stack_adjust (); - rtx_insn *seq = end_sequence (); - - return seq; + return end_sequence (); } /* Insert a copy instruction from partition SRC to DEST onto edge E. */