https://gcc.gnu.org/g:cea82e41d3db61fbd0d181d113967b83ed69070c
commit r17-5843-gcea82e41d3db61fbd0d181d113967b83ed69070c Author: Trevor Saunders <[email protected]> Date: Sat Oct 24 06:23:16 2026 +0000 Use rtx_code_label * for locals set by gen_label_rtx gcc/ChangeLog: * calls.cc (prepare_call_address): Use rtx_code_label * for a local set only by gen_label_rtx. * config/aarch64/aarch64.cc (aarch64_expand_fp_spaceship): Likewise. * config/alpha/alpha.cc (alpha_emit_floatuns): Likewise. * config/alpha/alpha.md (@reload_out<mode>_safe_bwa, reload_out<mode>_aligned): Likewise. * config/arc/arc.cc (arc_expand_compare_and_swap_qh, arc_split_compare_and_swap, hwloop_optimize): Likewise. * config/avr/avr.cc (avr_emit_skip_clear, avr_emit_skip_pixop): Likewise. * config/avr/avr.md (flash_segment): Likewise. * config/bfin/bfin.cc (hwloop_optimize): Likewise. * config/cris/cris.cc (cris_emit_trap_for_misalignment): Likewise. * config/csky/csky.cc (csky_expand_prologue): Likewise. * config/csky/csky.md (builtin_setjmp_receiver): Likewise. * config/gcn/gcn-valu.md (fold_extract_last_<mode>): Likewise. * config/gcn/gcn.cc (gcn_expand_builtin_1): Likewise. * config/gcn/gcn.md (<expander>ti3): Likewise. * config/i386/i386-expand.cc (ix86_expand_fp_spaceship): Likewise. * config/ia64/ia64.cc (ia64_expand_atomic_op): Likewise. * config/nds32/nds32-memory-manipulation.cc (emit_setmem_byte_loop, emit_setmem_doubleword_loop, nds32_expand_cpymemsi_loop_known_size, nds32_expand_cpymemsi_loop_unknown_size, nds32_expand_setmem_loop_v3m, nds32_expand_strlen): Likewise. * config/pa/pa.cc (pa_return_addr_rtx): Likewise. * config/pa/pa.md (clear_cache): Likewise. * config/pru/pru.md (cbranchdi4): Likewise. * config/riscv/riscv-string.cc (expand_block_move, expand_rawmemchr, expand_strcmp, riscv_block_move_loop, riscv_expand_block_compare_scalar, riscv_expand_strcmp_scalar, riscv_expand_strlen_scalar): Likewise. * config/riscv/riscv-v.cc (expand_fold_extract_last, expand_mask_reduction): Likewise. * config/riscv/riscv.cc (riscv_allocate_and_probe_stack_loop): Likewise. * config/riscv/riscv.md (<round_pattern><ANYF:mode>2, restore_stack_nonlocal): Likewise. * config/rs6000/rs6000-builtin.cc (rs6000_expand_builtin): Likewise. * config/rs6000/rs6000-call.cc (setup_incoming_varargs): Likewise. * config/rs6000/rs6000-logue.cc (emit_split_stack_prologue, rs6000_emit_load_toc_table, rs6000_emit_prologue, rs6000_expand_split_stack_prologue): Likewise. * config/rs6000/rs6000-string.cc (expand_block_compare, expand_block_compare_gpr, expand_compare_loop, expand_strn_compare): Likewise. * config/rs6000/rs6000.cc (rs6000_call_darwin_1, rs6000_generate_compare, rs6000_legitimize_tls_address): Likewise. * config/rs6000/rs6000.md (strlensi, floatdisf2, abs<mode>2): Likewise. * config/s390/s390.cc (s390_expand_vec_strlen, s390_expand_vec_movstr, s390_expand_int_spaceship, s390_expand_cstoreti4, s390_expand_fp_spaceship, s390_rawmemchr): Likewise. * config/stormy16/stormy16.cc (xstormy16_emit_cbranch): Likewise. * config/vax/builtins.md (ffs<mode>2, sync_lock_test_and_set<mode>, sync_lock_release<mode>): Likewise. * config/xtensa/xtensa.cc (xtensa_return_addr): Likewise. * explow.cc (anti_adjust_stack_and_probe_stack_clash): Likewise. * rtl-tests.cc (test_dumping_insns, test_uncond_jump): Likewise. Diff: --- gcc/calls.cc | 2 +- gcc/config/aarch64/aarch64.cc | 8 +++---- gcc/config/alpha/alpha.cc | 3 ++- gcc/config/alpha/alpha.md | 4 ++-- gcc/config/arc/arc.cc | 14 ++++++----- gcc/config/avr/avr.cc | 4 ++-- gcc/config/avr/avr.md | 2 +- gcc/config/bfin/bfin.cc | 4 ++-- gcc/config/cris/cris.cc | 5 ++-- gcc/config/csky/csky.cc | 2 +- gcc/config/csky/csky.md | 2 +- gcc/config/gcn/gcn-valu.md | 4 ++-- gcc/config/gcn/gcn.cc | 4 ++-- gcc/config/gcn/gcn.md | 2 +- gcc/config/i386/i386-expand.cc | 8 +++---- gcc/config/ia64/ia64.cc | 4 ++-- gcc/config/nds32/nds32-memory-manipulation.cc | 21 ++++++++++------- gcc/config/pa/pa.cc | 2 +- gcc/config/pa/pa.md | 2 +- gcc/config/pru/pru.md | 6 ++--- gcc/config/riscv/riscv-string.cc | 26 ++++++++++---------- gcc/config/riscv/riscv-v.cc | 8 +++---- gcc/config/riscv/riscv.cc | 2 +- gcc/config/riscv/riscv.md | 14 +++++------ gcc/config/rs6000/rs6000-builtin.cc | 2 +- gcc/config/rs6000/rs6000-call.cc | 2 +- gcc/config/rs6000/rs6000-logue.cc | 16 +++++++------ gcc/config/rs6000/rs6000-string.cc | 34 +++++++++++++-------------- gcc/config/rs6000/rs6000.cc | 8 +++---- gcc/config/rs6000/rs6000.md | 11 ++++----- gcc/config/s390/s390.cc | 30 +++++++++++------------ gcc/config/stormy16/stormy16.cc | 4 ++-- gcc/config/vax/builtins.md | 8 +++---- gcc/config/xtensa/xtensa.cc | 3 ++- gcc/explow.cc | 2 +- gcc/rtl-tests.cc | 4 ++-- 36 files changed, 142 insertions(+), 135 deletions(-) diff --git a/gcc/calls.cc b/gcc/calls.cc index d4f66bc47f28..b7e5d74fc494 100644 --- a/gcc/calls.cc +++ b/gcc/calls.cc @@ -232,7 +232,7 @@ prepare_call_address (tree fndecl_or_type, rtx funexp, rtx static_chain_value, if ((flags & ECF_BY_DESCRIPTOR) && !flag_trampolines) { const int bit_val = targetm.calls.custom_function_descriptors; - rtx call_lab = gen_label_rtx (); + rtx_code_label *call_lab = gen_label_rtx (); gcc_assert (fndecl_or_type && TYPE_P (fndecl_or_type)); fndecl_or_type diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index 948967982dd8..b3ab80050dd1 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -34059,10 +34059,10 @@ aarch64_expand_fp_spaceship (rtx dest, rtx op0, rtx op1, rtx hint) if (hint == const0_rtx) { - rtx un_label = gen_label_rtx (); - rtx lt_label = gen_label_rtx (); - rtx gt_label = gen_label_rtx (); - rtx end_label = gen_label_rtx (); + rtx_code_label *un_label = gen_label_rtx (); + rtx_code_label *lt_label = gen_label_rtx (); + rtx_code_label *gt_label = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); rtx temp = gen_rtx_IF_THEN_ELSE (VOIDmode, cc_un, gen_rtx_LABEL_REF (Pmode, un_label), pc_rtx); diff --git a/gcc/config/alpha/alpha.cc b/gcc/config/alpha/alpha.cc index 3165a1e8d4a0..6c9087910afd 100644 --- a/gcc/config/alpha/alpha.cc +++ b/gcc/config/alpha/alpha.cc @@ -2560,7 +2560,8 @@ alpha_expand_movmisalign (machine_mode mode, rtx *operands) void alpha_emit_floatuns (rtx operands[2]) { - rtx neglab, donelab, i0, i1, f0, in, out; + rtx_code_label *neglab, *donelab; + rtx i0, i1, f0, in, out; machine_mode mode; out = operands[0]; diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md index 269e2afe4707..80bc27556bd0 100644 --- a/gcc/config/alpha/alpha.md +++ b/gcc/config/alpha/alpha.md @@ -4589,7 +4589,7 @@ emit_move_insn (areg, addr); emit_move_insn (aligned_addr, gen_rtx_AND (DImode, areg, GEN_INT (-8))); - rtx label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); emit_label (label); LABEL_NUSES (label) = 1; @@ -4643,7 +4643,7 @@ get_aligned_mem (operands[0], &aligned_mem, &bitnum); if (TARGET_SAFE_BWA) { - rtx label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); emit_label (label); LABEL_NUSES (label) = 1; diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc index 3a24f903092d..1cf2f5fa873c 100644 --- a/gcc/config/arc/arc.cc +++ b/gcc/config/arc/arc.cc @@ -8003,7 +8003,7 @@ hwloop_optimize (hwloop_info loop) edge entry_edge; basic_block entry_bb, bb; rtx iter_reg; - rtx_insn *insn, *seq, *entry_after, *last_insn, *end_label; + rtx_insn *insn, *seq, *entry_after, *last_insn; unsigned int length; bool need_fix = false; rtx lp_reg = gen_rtx_REG (SImode, LP_COUNT); @@ -8227,7 +8227,7 @@ hwloop_optimize (hwloop_info loop) return false; } /* The loop is good. */ - end_label = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); loop->end_label = end_label; /* Place the zero_cost_loop_start instruction before the loop. */ @@ -10371,7 +10371,9 @@ arc_expand_compare_and_swap_qh (rtx bool_result, rtx result, rtx mem, rtx newvalue = gen_reg_rtx (SImode); rtx res = gen_reg_rtx (SImode); rtx resv = gen_reg_rtx (SImode); - rtx memsi, val, mask, end_label, loop_label, cc, x; + rtx memsi, val, mask; + rtx_code_label *end_label, *loop_label; + rtx cc, x; machine_mode mode; bool is_weak = (weak != const0_rtx); @@ -10541,7 +10543,7 @@ arc_split_compare_and_swap (rtx operands[]) machine_mode mode; enum memmodel mod_s, mod_f; bool is_weak; - rtx label1, label2, x, cond; + rtx x, cond; rval = operands[0]; mem = operands[1]; @@ -10557,13 +10559,13 @@ arc_split_compare_and_swap (rtx operands[]) arc_pre_atomic_barrier (mod_s); - label1 = NULL_RTX; + rtx_code_label *label1 = nullptr; if (!is_weak) { label1 = gen_label_rtx (); emit_label (label1); } - label2 = gen_label_rtx (); + rtx_code_label *label2 = gen_label_rtx (); /* Load exclusive. */ emit_insn (gen_arc_load_exclusivesi (rval, mem)); diff --git a/gcc/config/avr/avr.cc b/gcc/config/avr/avr.cc index f6aef849bd34..95343ad417df 100644 --- a/gcc/config/avr/avr.cc +++ b/gcc/config/avr/avr.cc @@ -15175,7 +15175,7 @@ avr_emit_skip_pixop (rtx_code pix, rtx dest, rtx op0, rtx op1, emit_move_insn (dest, op0); // Skip if bits.bitno <eqne> bitno. - rtx xlabel = gen_label_rtx (); + rtx_code_label *xlabel = gen_label_rtx (); rtx zerox = gen_rtx_ZERO_EXTRACT (QImode, bits, const1_rtx, GEN_INT (bitno)); rtx cond = gen_rtx_fmt_ee (eqne, VOIDmode, zerox, const0_rtx); emit (gen_sbrx_branchqi_split (cond, bits, const0_rtx, xlabel)); @@ -15220,7 +15220,7 @@ avr_emit_skip_clear (rtx dest, rtx src, rtx_code eqne, rtx bits, int bitno) emit_move_insn (dest, src); // Skip if bits.bitno <eqne> bitno. - rtx xlabel = gen_label_rtx (); + rtx_code_label *xlabel = gen_label_rtx (); rtx zerox = gen_rtx_ZERO_EXTRACT (QImode, bits, const1_rtx, GEN_INT (bitno)); rtx cond = gen_rtx_fmt_ee (eqne, VOIDmode, zerox, const0_rtx); emit (gen_sbrx_branchqi_split (cond, bits, const0_rtx, xlabel)); diff --git a/gcc/config/avr/avr.md b/gcc/config/avr/avr.md index a19f387c0174..f94e98c4b81f 100644 --- a/gcc/config/avr/avr.md +++ b/gcc/config/avr/avr.md @@ -8646,7 +8646,7 @@ (match_operand:PSI 1 "register_operand" "")])] "" { - rtx label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); emit (gen_flash_segment1 (operands[0], operands[1], label)); emit_label (label); DONE; diff --git a/gcc/config/bfin/bfin.cc b/gcc/config/bfin/bfin.cc index c8511dde7a98..68b9cf9240cc 100644 --- a/gcc/config/bfin/bfin.cc +++ b/gcc/config/bfin/bfin.cc @@ -3453,7 +3453,7 @@ hwloop_optimize (hwloop_info loop) { basic_block bb; rtx_insn *insn, *last_insn; - rtx loop_init, start_label, end_label; + rtx loop_init, start_label; rtx iter_reg, scratchreg, scratch_init; rtx_insn *scratch_init_insn; rtx lc_reg, lt_reg, lb_reg; @@ -3676,7 +3676,7 @@ hwloop_optimize (hwloop_info loop) /* The loop is good for replacement. */ start_label = loop->start_label; - end_label = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); iter_reg = loop->iter_reg; if (loop->depth == 1 && !clobber1) diff --git a/gcc/config/cris/cris.cc b/gcc/config/cris/cris.cc index 41ebd9ecd802..f3f32fd05838 100644 --- a/gcc/config/cris/cris.cc +++ b/gcc/config/cris/cris.cc @@ -1864,7 +1864,8 @@ cris_simple_epilogue (void) void cris_emit_trap_for_misalignment (rtx mem) { - rtx addr, reg, ok_label, andop; + rtx addr, reg; + rtx andop; rtx_insn *jmp; int natural_alignment; gcc_assert (MEM_P (mem)); @@ -1872,7 +1873,7 @@ cris_emit_trap_for_misalignment (rtx mem) natural_alignment = GET_MODE_SIZE (GET_MODE (mem)); addr = XEXP (mem, 0); reg = force_reg (Pmode, addr); - ok_label = gen_label_rtx (); + rtx_code_label *ok_label = gen_label_rtx (); /* This will yield a btstq without a separate register used, usually - with the exception for PRE hoisting the "and" but not the branch diff --git a/gcc/config/csky/csky.cc b/gcc/config/csky/csky.cc index f5f67ca149ea..71da4f0d0f72 100644 --- a/gcc/config/csky/csky.cc +++ b/gcc/config/csky/csky.cc @@ -5801,7 +5801,7 @@ csky_expand_prologue (void) "Function Prologue for PIC". */ if (flag_pic && (reg_mask & (1 << PIC_OFFSET_TABLE_REGNUM))) { - rtx l1 = gen_label_rtx (); + rtx_code_label *l1 = gen_label_rtx (); rtx grs_label = gen_rtx_LABEL_REF (SImode, l1); rtx reg_gb = gen_rtx_REG (SImode, PIC_OFFSET_TABLE_REGNUM); rtx reg_temp = gen_rtx_REG (SImode, 13); diff --git a/gcc/config/csky/csky.md b/gcc/config/csky/csky.md index 9d6cfd429a6d..dea5fd0cc2d3 100644 --- a/gcc/config/csky/csky.md +++ b/gcc/config/csky/csky.md @@ -3548,7 +3548,7 @@ [(label_ref (match_operand 0 "" ""))] "flag_pic" "{ - rtx l1 = gen_label_rtx(); + rtx_code_label *l1 = gen_label_rtx (); rtx grs_label = gen_rtx_LABEL_REF (SImode, l1); rtx reg_gb = gen_rtx_REG (SImode, PIC_OFFSET_TABLE_REGNUM); rtx reg_temp = gen_rtx_REG (SImode, 12); diff --git a/gcc/config/gcn/gcn-valu.md b/gcc/config/gcn/gcn-valu.md index f816f82559bb..7b1ce8e66a9d 100644 --- a/gcc/config/gcn/gcn-valu.md +++ b/gcc/config/gcn/gcn-valu.md @@ -1091,8 +1091,8 @@ rtx default_value = operands[1]; rtx mask = operands[2]; rtx vect = operands[3]; - rtx else_label = gen_label_rtx (); - rtx end_label = gen_label_rtx (); + rtx_code_label *else_label = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); rtx cond = gen_rtx_EQ (VOIDmode, mask, const0_rtx); emit_jump_insn (gen_cbranchdi4 (cond, mask, const0_rtx, else_label)); diff --git a/gcc/config/gcn/gcn.cc b/gcc/config/gcn/gcn.cc index 0fd61fbf1be9..26b1fb1c571a 100644 --- a/gcc/config/gcn/gcn.cc +++ b/gcc/config/gcn/gcn.cc @@ -4977,7 +4977,7 @@ gcn_expand_builtin_1 (tree exp, rtx target, rtx /*subtarget */ , SImode, EXPAND_NORMAL)); rtx wavefront = gcn_oacc_dim_pos (1); rtx cond = gen_rtx_NE (VOIDmode, wavefront, const0_rtx); - rtx not_zero = gen_label_rtx (); + rtx_code_label *not_zero = gen_label_rtx (); emit_insn (gen_cbranchsi4 (cond, wavefront, const0_rtx, not_zero)); emit_move_insn (blk, const0_rtx); emit_label (not_zero); @@ -5091,7 +5091,7 @@ gcn_expand_builtin_1 (tree exp, rtx target, rtx /*subtarget */ , emit_move_insn (result, const0_rtx); if (cfun->machine->args.reg[QUEUE_PTR_ARG] >= 0) { - rtx not_first = gen_label_rtx (); + rtx_code_label *not_first = gen_label_rtx (); rtx reg = gen_rtx_REG (DImode, cfun->machine->args.reg[QUEUE_PTR_ARG]); reg = gcn_operand_part (DImode, reg, 1); diff --git a/gcc/config/gcn/gcn.md b/gcc/config/gcn/gcn.md index c014582885f3..29d63425a0b1 100644 --- a/gcc/config/gcn/gcn.md +++ b/gcc/config/gcn/gcn.md @@ -1847,7 +1847,7 @@ : shiftval < 64 ? SMALL : LARGE); - rtx large_label, zero_label, exit_label; + rtx_code_label *large_label, *zero_label, *exit_label; if (shiftcomparison == RUNTIME) { diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc index 8a6f0280ac6a..9473cc1f2534 100644 --- a/gcc/config/i386/i386-expand.cc +++ b/gcc/config/i386/i386-expand.cc @@ -3187,10 +3187,10 @@ ix86_expand_fp_spaceship (rtx dest, rtx op0, rtx op1, rtx op2) && GET_MODE (dest) == SImode) zero = force_reg (SImode, const0_rtx); rtx gt = ix86_expand_fp_compare (GT, op0, op1); - rtx l0 = op2 == const0_rtx ? gen_label_rtx () : NULL_RTX; - rtx l1 = op2 == const0_rtx ? gen_label_rtx () : NULL_RTX; - rtx l2 = TARGET_IEEE_FP ? gen_label_rtx () : NULL_RTX; - rtx lend = gen_label_rtx (); + rtx_code_label *l0 = op2 == const0_rtx ? gen_label_rtx () : nullptr; + rtx_code_label *l1 = op2 == const0_rtx ? gen_label_rtx () : nullptr; + rtx_code_label *l2 = TARGET_IEEE_FP ? gen_label_rtx () : nullptr; + rtx_code_label *lend = gen_label_rtx (); rtx tmp; rtx_insn *jmp; if (l2) diff --git a/gcc/config/ia64/ia64.cc b/gcc/config/ia64/ia64.cc index 292c6b3d9390..624d06f72f1d 100644 --- a/gcc/config/ia64/ia64.cc +++ b/gcc/config/ia64/ia64.cc @@ -2375,7 +2375,7 @@ ia64_expand_atomic_op (enum rtx_code code, rtx mem, rtx val, rtx old_dst, rtx new_dst, enum memmodel model) { machine_mode mode = GET_MODE (mem); - rtx old_reg, new_reg, cmp_reg, ar_ccv, label; + rtx old_reg, new_reg, cmp_reg, ar_ccv; enum insn_code icode; /* Special case for using fetchadd. */ @@ -2438,7 +2438,7 @@ ia64_expand_atomic_op (enum rtx_code code, rtx mem, rtx val, old_reg = gen_reg_rtx (DImode); cmp_reg = gen_reg_rtx (DImode); - label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); if (mode != DImode) { diff --git a/gcc/config/nds32/nds32-memory-manipulation.cc b/gcc/config/nds32/nds32-memory-manipulation.cc index bc9644cd4b6b..16c5ef7870ef 100644 --- a/gcc/config/nds32/nds32-memory-manipulation.cc +++ b/gcc/config/nds32/nds32-memory-manipulation.cc @@ -160,7 +160,10 @@ nds32_expand_cpymemsi_loop_unknown_size (rtx dstmem, rtx srcmem, rtx dst_end; rtx size_least_3_bit; rtx double_word_end; - rtx double_word_mode_loop, byte_mode_entry, byte_mode_loop, end_label; + rtx_code_label *double_word_mode_loop; + rtx_code_label *byte_mode_entry; + rtx_code_label *byte_mode_loop; + rtx_code_label *end_label; rtx tmp; rtx mask_least_3_bit; int start_regno; @@ -261,7 +264,7 @@ nds32_expand_cpymemsi_loop_known_size (rtx dstmem, rtx srcmem, rtx dst_itr, src_itr; rtx dstmem_m, srcmem_m, dst_itr_m, src_itr_m; rtx dst_end; - rtx double_word_mode_loop, byte_mode_loop; + rtx_code_label *double_word_mode_loop, *byte_mode_loop; rtx tmp; int start_regno; bool align_to_4_bytes = (INTVAL (alignment) & 3) == 0; @@ -632,8 +635,8 @@ nds32_gen_dup_8_byte_to_double_word_value (rtx value) static rtx emit_setmem_doubleword_loop (rtx itr, rtx size, rtx value) { - rtx word_mode_label = gen_label_rtx (); - rtx word_mode_end_label = gen_label_rtx (); + rtx_code_label *word_mode_label = gen_label_rtx (); + rtx_code_label *word_mode_end_label = gen_label_rtx (); rtx byte_mode_size = gen_reg_rtx (SImode); rtx byte_mode_size_tmp = gen_reg_rtx (SImode); rtx word_mode_end = gen_reg_rtx (SImode); @@ -679,8 +682,8 @@ static rtx emit_setmem_byte_loop (rtx itr, rtx size, rtx value, bool need_end) { rtx end = gen_reg_rtx (Pmode); - rtx byte_mode_label = gen_label_rtx (); - rtx end_label = gen_label_rtx (); + rtx_code_label *byte_mode_label = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); value = force_reg (QImode, value); @@ -805,7 +808,7 @@ nds32_expand_setmem_loop_v3m (rtx dstmem, rtx size, rtx value) rtx new_base_reg; rtx value4byte, value4doubleword; rtx byte_mode_size; - rtx last_byte_loop_label = gen_label_rtx (); + rtx_code_label *last_byte_loop_label = gen_label_rtx (); size = force_reg (SImode, size); @@ -1010,7 +1013,7 @@ nds32_expand_strlen (rtx result, rtx str, rtx base_reg, backup_base_reg; rtx ffb_result; rtx target_char_ptr, length; - rtx loop_label, tmp; + rtx tmp; if (optimize_size || optimize < 3) return false; @@ -1019,7 +1022,7 @@ nds32_expand_strlen (rtx result, rtx str, gcc_assert (CONST_INT_P (target_char) || REG_P (target_char)); base_reg = copy_to_mode_reg (SImode, XEXP (str, 0)); - loop_label = gen_label_rtx (); + rtx_code_label *loop_label = gen_label_rtx (); ffb_result = gen_reg_rtx (Pmode); tmp = gen_reg_rtx (SImode); diff --git a/gcc/config/pa/pa.cc b/gcc/config/pa/pa.cc index 98215edbd11e..9a0e0c8910c5 100644 --- a/gcc/config/pa/pa.cc +++ b/gcc/config/pa/pa.cc @@ -5069,7 +5069,7 @@ hppa_profile_hook (int label_no) rtx pa_return_addr_rtx (int count, rtx frameaddr) { - rtx label; + rtx_code_label *label; rtx rp; rtx saved_rp; rtx ins; diff --git a/gcc/config/pa/pa.md b/gcc/config/pa/pa.md index e91522ea9cca..a7f8ff1448d8 100644 --- a/gcc/config/pa/pa.md +++ b/gcc/config/pa/pa.md @@ -10029,7 +10029,7 @@ add,l %2,%3,%3\;bv,n %%r0(%3)" { rtx start = gen_reg_rtx (Pmode); rtx line_size = gen_reg_rtx (Pmode); - rtx lab = gen_label_rtx (); + rtx_code_label *lab = gen_label_rtx (); rtx op0 = operands[0]; rtx op1 = operands[1]; diff --git a/gcc/config/pru/pru.md b/gcc/config/pru/pru.md index 93638963d29e..4c3c9c554c0f 100644 --- a/gcc/config/pru/pru.md +++ b/gcc/config/pru/pru.md @@ -1627,7 +1627,7 @@ if (code == EQ) { - rtx label_fallthrough = gen_label_rtx (); + rtx_code_label *label_fallthrough = gen_label_rtx (); rtx label_fallthrough_ref = gen_rtx_LABEL_REF (Pmode, label_fallthrough); rtx cond_hi = gen_rtx_fmt_ee (NE, VOIDmode, op1_hi, op2_hi); @@ -1682,7 +1682,7 @@ LABEL_NUSES (label3)++; /* Check for "DI comparison obviously not true". */ - rtx label_fallthrough = gen_label_rtx (); + rtx_code_label *label_fallthrough = gen_label_rtx (); rtx label_fallthrough_ref = gen_rtx_LABEL_REF (Pmode, label_fallthrough); rtx cond_hine = gen_rtx_fmt_ee (NE, VOIDmode, op1_hi, op2_hi); rtx check_hine = gen_rtx_IF_THEN_ELSE (VOIDmode, cond_hine, @@ -1709,7 +1709,7 @@ { /* Check for "DI comparison obviously not true". */ const enum rtx_code reversed_code = reverse_condition (code); - rtx label_fallthrough = gen_label_rtx (); + rtx_code_label *label_fallthrough = gen_label_rtx (); rtx label_fallthrough_ref = gen_rtx_LABEL_REF (Pmode, label_fallthrough); rtx cond_hi = gen_rtx_fmt_ee (pru_noteq_condition (reversed_code), VOIDmode, op1_hi, op2_hi); diff --git a/gcc/config/riscv/riscv-string.cc b/gcc/config/riscv/riscv-string.cc index 1ce898929549..985aecb4768e 100644 --- a/gcc/config/riscv/riscv-string.cc +++ b/gcc/config/riscv/riscv-string.cc @@ -426,9 +426,9 @@ riscv_expand_strcmp_scalar (rtx result, rtx src1, rtx src2, rtx data1 = gen_reg_rtx (Xmode); rtx data2 = gen_reg_rtx (Xmode); rtx orc1 = gen_reg_rtx (Xmode); - rtx nonul_end_label = gen_label_rtx (); - rtx end_label = gen_label_rtx (); - rtx final_label = gen_label_rtx (); + rtx_code_label *nonul_end_label = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); + rtx_code_label *final_label = gen_label_rtx (); /* Generate a sequence of zbb instructions to compare out to the length specified. */ @@ -546,7 +546,7 @@ static bool riscv_expand_strlen_scalar (rtx result, rtx src, rtx align) { rtx testval, addr, addr_plus_regsz, word, zeros; - rtx loop_label, cond; + rtx cond; gcc_assert (TARGET_ZBB || TARGET_XTHEADBB); @@ -567,7 +567,7 @@ riscv_expand_strlen_scalar (rtx result, rtx src, rtx align) do_add3 (addr_plus_regsz, addr, GEN_INT (UNITS_PER_WORD)); - loop_label = gen_label_rtx (); + rtx_code_label *loop_label = gen_label_rtx (); emit_label (loop_label); /* Load a word and use orc.b/th.tstnbz to find a zero-byte. */ @@ -761,8 +761,8 @@ riscv_expand_block_compare_scalar (rtx result, rtx src1, rtx src2, rtx nbytes) rtx data1 = gen_reg_rtx (Xmode); rtx data2 = gen_reg_rtx (Xmode); - rtx diff_label = gen_label_rtx (); - rtx final_label = gen_label_rtx (); + rtx_code_label *diff_label = gen_label_rtx (); + rtx_code_label *final_label = gen_label_rtx (); /* Generate a sequence of zbb instructions to compare out to the length specified. */ @@ -919,7 +919,7 @@ riscv_block_move_loop (rtx dest, rtx src, unsigned HOST_WIDE_INT length, unsigned HOST_WIDE_INT align, unsigned HOST_WIDE_INT bytes_per_iter) { - rtx label, src_reg, dest_reg, final_src, test; + rtx src_reg, dest_reg, final_src, test; unsigned HOST_WIDE_INT leftover; leftover = length % bytes_per_iter; @@ -935,7 +935,7 @@ riscv_block_move_loop (rtx dest, rtx src, unsigned HOST_WIDE_INT length, 0, 0, OPTAB_WIDEN); /* Emit the start of the loop. */ - label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); emit_label (label); /* Emit the loop body. */ @@ -1466,7 +1466,7 @@ expand_block_move (rtx dst_in, rtx src_in, rtx length_in, bool overlap_p) /* avl holds the (remaining) length of the required copy. cnt holds the length we copy with the current load/store pair. */ rtx cnt = info.avl; - rtx label = NULL_RTX; + rtx_code_label *label = nullptr; rtx dst_addr = copy_addr_to_reg (XEXP (dst_in, 0)); rtx src_addr = copy_addr_to_reg (XEXP (src_in, 0)); @@ -1582,7 +1582,7 @@ expand_rawmemchr (machine_mode mode, rtx dst, rtx haystack, rtx needle, rtx src_addr = copy_addr_to_reg (XEXP (haystack, 0)); rtx start_addr = copy_addr_to_reg (XEXP (haystack, 0)); - rtx loop = gen_label_rtx (); + rtx_code_label *loop = gen_label_rtx (); emit_label (loop); rtx vsrc = change_address (haystack, vmode, src_addr); @@ -1683,8 +1683,8 @@ expand_strcmp (rtx result, rtx src1, rtx src2, rtx nbytes, rtx vec1 = gen_reg_rtx (vmode); rtx vec2 = gen_reg_rtx (vmode); - rtx done = gen_label_rtx (); - rtx loop = gen_label_rtx (); + rtx_code_label *done = gen_label_rtx (); + rtx_code_label *loop = gen_label_rtx (); emit_label (loop); /* Bump the pointers. */ diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc index 726be0e001f4..cd45f7049e30 100644 --- a/gcc/config/riscv/riscv-v.cc +++ b/gcc/config/riscv/riscv-v.cc @@ -5112,8 +5112,8 @@ expand_mask_reduction (rtx *ops, rtx_code code) else gcc_unreachable (); - rtx els = gen_label_rtx (); - rtx end = gen_label_rtx (); + rtx_code_label *els = gen_label_rtx (); + rtx_code_label *end = gen_label_rtx (); riscv_expand_conditional_branch (els, eq_zero ? EQ : NE, tmp, const0_rtx); emit_move_insn (dest, const0_rtx); @@ -5222,8 +5222,8 @@ expand_fold_extract_last (rtx *ops) rtx anchor = gen_reg_rtx (Pmode); rtx index = gen_reg_rtx (Pmode); rtx vect = ops[3]; - rtx else_label = gen_label_rtx (); - rtx end_label = gen_label_rtx (); + rtx_code_label *else_label = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); rtx len = ops[4]; machine_mode mode = GET_MODE (vect); machine_mode mask_mode = GET_MODE (mask); diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 960ab7ae8311..769d027d96f6 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -10346,7 +10346,7 @@ riscv_allocate_and_probe_stack_loop (rtx tmp, enum rtx_code code, tmp = riscv_force_temporary (tmp, gen_int_mode (offset, Pmode)); /* Loop. */ - rtx label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); emit_label (label); /* Allocate and probe stack. */ diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md index 8cb95cdf4c74..47e83e876305 100644 --- a/gcc/config/riscv/riscv.md +++ b/gcc/config/riscv/riscv.md @@ -2345,10 +2345,10 @@ else { rtx reg; - rtx label1 = gen_label_rtx (); - rtx label2 = gen_label_rtx (); - rtx label3 = gen_label_rtx (); - rtx end_label = gen_label_rtx (); + rtx_code_label *label1 = gen_label_rtx (); + rtx_code_label *label2 = gen_label_rtx (); + rtx_code_label *label3 = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); rtx abs_reg = gen_reg_rtx (<ANYF:MODE>mode); rtx coeff_reg = gen_reg_rtx (<ANYF:MODE>mode); rtx tmp_reg = gen_reg_rtx (<ANYF:MODE>mode); @@ -4578,11 +4578,11 @@ emit_insn (gen_ssrdp (word_mode, cur_ssp)); /* Compare and jump over adjustment code. */ - rtx noadj_label = gen_label_rtx (); + rtx_code_label *noadj_label = gen_label_rtx (); emit_cmp_and_jump_insns (cur_ssp, const0_rtx, EQ, NULL_RTX, word_mode, 1, noadj_label); - rtx loop_label = gen_label_rtx (); + rtx_code_label *loop_label = gen_label_rtx (); emit_label (loop_label); LABEL_NUSES (loop_label) = 1; @@ -4606,7 +4606,7 @@ emit_barrier (); /* Adjust the ssp in a loop. */ - rtx cmp_4k_label = gen_label_rtx (); + rtx_code_label *cmp_4k_label = gen_label_rtx (); emit_label (cmp_4k_label); LABEL_NUSES (cmp_4k_label) = 1; diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs6000-builtin.cc index f5f823074c64..33c82b949528 100644 --- a/gcc/config/rs6000/rs6000-builtin.cc +++ b/gcc/config/rs6000/rs6000-builtin.cc @@ -3534,7 +3534,7 @@ rs6000_expand_builtin (tree exp, rtx target, rtx /* subtarget */, error ("invalid arguments to builtin"); // Create a label for the end of the function. - rtx done_label = gen_label_rtx (); + rtx_code_label *done_label = gen_label_rtx (); /* Standard Semantics: Update 'expected' ONLY on failure. If target (the boolean result) is NOT 0, the CAS succeeded. diff --git a/gcc/config/rs6000/rs6000-call.cc b/gcc/config/rs6000/rs6000-call.cc index 3f9629514a52..742751465fa8 100644 --- a/gcc/config/rs6000/rs6000-call.cc +++ b/gcc/config/rs6000/rs6000-call.cc @@ -2410,7 +2410,7 @@ setup_incoming_varargs (cumulative_args_t cum, { int fregno = next_cum.fregno, nregs; rtx cr1 = gen_rtx_REG (CCmode, CR1_REGNO); - rtx lab = gen_label_rtx (); + rtx_code_label *lab = gen_label_rtx (); int off = (GP_ARG_NUM_REG * reg_size) + ((fregno - FP_ARG_MIN_REG) * UNITS_PER_FP_WORD); diff --git a/gcc/config/rs6000/rs6000-logue.cc b/gcc/config/rs6000/rs6000-logue.cc index 960280caff07..4c0b939d43cd 100644 --- a/gcc/config/rs6000/rs6000-logue.cc +++ b/gcc/config/rs6000/rs6000-logue.cc @@ -1303,11 +1303,11 @@ rs6000_emit_load_toc_table (int fromprolog) } else { - rtx tocsym, lab; + rtx tocsym; tocsym = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (toc_label_name)); need_toc_init = 1; - lab = gen_label_rtx (); + rtx_code_label *lab = gen_label_rtx (); emit_insn (gen_load_toc_v4_PIC_1b (tocsym, lab)); emit_move_insn (dest, gen_rtx_REG (Pmode, LR_REGNO)); if (TARGET_LINK_STACK) @@ -2973,7 +2973,7 @@ emit_split_stack_prologue (rs6000_stack_t *info, rtx_insn *sp_adjust, rtx r12 = gen_rtx_REG (Pmode, 12); rtx r29 = gen_rtx_REG (Pmode, 29); rtx cr7 = gen_rtx_REG (CCUNSmode, CR7_REGNO); - rtx not_more = gen_label_rtx (); + rtx_code_label *not_more = gen_label_rtx (); rtx jump; jump = gen_rtx_IF_THEN_ELSE (VOIDmode, @@ -3449,7 +3449,8 @@ rs6000_emit_prologue (void) /* In AIX ABI we need to make sure r2 is really saved. */ if (TARGET_AIX && crtl->calls_eh_return) { - rtx tmp_reg, tmp_reg_si, hi, lo, compare_result, toc_save_done, jump; + rtx tmp_reg, tmp_reg_si, hi, lo, compare_result; + rtx jump; rtx join_insn, note; rtx_insn *save_insn; long toc_restore_insn; @@ -3479,7 +3480,7 @@ rs6000_emit_prologue (void) lo = gen_int_mode (toc_restore_insn & 0xffff, SImode); emit_insn (gen_rtx_SET (compare_result, gen_rtx_COMPARE (CCUNSmode, tmp_reg_si, lo))); - toc_save_done = gen_label_rtx (); + rtx_code_label *toc_save_done = gen_label_rtx (); jump = gen_rtx_IF_THEN_ELSE (VOIDmode, gen_rtx_EQ (VOIDmode, compare_result, const0_rtx), @@ -5551,7 +5552,8 @@ rs6000_expand_split_stack_prologue (void) rs6000_stack_t *info = rs6000_stack_info (); unsigned HOST_WIDE_INT allocate; long alloc_hi, alloc_lo; - rtx r0, r1, r12, lr, ok_label, compare, jump, call_fusage; + rtx r0, r1, r12, lr; + rtx compare, jump, call_fusage; rtx_insn *insn; gcc_assert (flag_split_stack && reload_completed); @@ -5616,7 +5618,7 @@ rs6000_expand_split_stack_prologue (void) compare = gen_rtx_REG (CCUNSmode, CR7_REGNO); emit_insn (gen_rtx_SET (compare, gen_rtx_COMPARE (CCUNSmode, r12, r0))); - ok_label = gen_label_rtx (); + rtx_code_label *ok_label = gen_label_rtx (); jump = gen_rtx_IF_THEN_ELSE (VOIDmode, gen_rtx_GEU (VOIDmode, compare, const0_rtx), gen_rtx_LABEL_REF (VOIDmode, ok_label), diff --git a/gcc/config/rs6000/rs6000-string.cc b/gcc/config/rs6000/rs6000-string.cc index 0c14ba4cc3ea..dd594df32c83 100644 --- a/gcc/config/rs6000/rs6000-string.cc +++ b/gcc/config/rs6000/rs6000-string.cc @@ -1030,11 +1030,11 @@ expand_compare_loop (rtx operands[]) return false; bool no_remainder_code = false; - rtx final_label = gen_label_rtx (); + rtx_code_label *final_label = gen_label_rtx (); rtx final_ref = gen_rtx_LABEL_REF (VOIDmode, final_label); - rtx diff_label = gen_label_rtx (); - rtx library_call_label = NULL; - rtx cleanup_label = gen_label_rtx (); + rtx_code_label *diff_label = gen_label_rtx (); + rtx_code_label *library_call_label = nullptr; + rtx_code_label *cleanup_label = gen_label_rtx (); rtx cr; @@ -1170,7 +1170,7 @@ expand_compare_loop (rtx operands[]) } else { - rtx lab_after = gen_label_rtx (); + rtx_code_label *lab_after = gen_label_rtx (); do_ifelse (CCmode, LE, bytes_rtx, GEN_INT (max_bytes), NULL_RTX, lab_after, profile_probability::even ()); emit_move_insn (loop_cmp, mb_reg); @@ -1206,7 +1206,7 @@ expand_compare_loop (rtx operands[]) emit_move_insn (iv2, GEN_INT (load_mode_size)); /* inner loop to compare 2*word_mode */ - rtx loop_top_label = gen_label_rtx (); + rtx_code_label *loop_top_label = gen_label_rtx (); emit_label (loop_top_label); rtx src1_ix1 = gen_rtx_PLUS (word_mode, src1_addr, iv1); @@ -1330,7 +1330,7 @@ expand_compare_loop (rtx operands[]) NULL_RTX, final_label, profile_probability::unlikely ()); } - rtx final_cleanup = gen_label_rtx (); + rtx_code_label *final_cleanup = gen_label_rtx (); rtx cmp_rem_before = gen_reg_rtx (word_mode); /* Compare one more word_mode chunk if needed. */ if (!bytes_is_const || bytes_remaining >= load_mode_size) @@ -1426,8 +1426,8 @@ expand_compare_loop (rtx operands[]) } else if (!bytes_is_const) { - rtx handle4k_label = gen_label_rtx (); - rtx nonconst_overlap = gen_label_rtx (); + rtx_code_label *handle4k_label = gen_label_rtx (); + rtx_code_label *nonconst_overlap = gen_label_rtx (); emit_label (nonconst_overlap); /* Here we have to handle the case where we have runtime @@ -1508,7 +1508,7 @@ expand_compare_loop (rtx operands[]) rtx d1 = gen_reg_rtx (word_mode); rtx d2 = gen_reg_rtx (word_mode); - rtx fc_loop = gen_label_rtx (); + rtx_code_label *fc_loop = gen_label_rtx (); emit_label (fc_loop); do_load_for_compare_from_addr (QImode, d1, src1_ix, orig_src1); @@ -1739,8 +1739,8 @@ expand_block_compare_gpr(unsigned HOST_WIDE_INT bytes, unsigned int base_align, rtx tmp_reg_src1 = gen_reg_rtx (word_mode); rtx tmp_reg_src2 = gen_reg_rtx (word_mode); bool need_6432_conv = false; - rtx convert_label = NULL; - rtx final_label = NULL; + rtx_code_label *convert_label = nullptr; + rtx_code_label *final_label = nullptr; machine_mode load_mode; while (bytes > 0) @@ -2025,7 +2025,7 @@ expand_block_compare (rtx operands[]) if (use_vec) { - rtx final_move_label = gen_label_rtx (); + rtx_code_label *final_move_label = gen_label_rtx (); rtx s1addr = gen_reg_rtx (Pmode); rtx s2addr = gen_reg_rtx (Pmode); rtx off_reg = gen_reg_rtx (Pmode); @@ -2517,15 +2517,15 @@ expand_strn_compare (rtx operands[], int no_length) } rtx result_reg = gen_reg_rtx (word_mode); - rtx final_move_label = gen_label_rtx (); - rtx final_label = gen_label_rtx (); - rtx begin_compare_label = NULL; + rtx_code_label *final_move_label = gen_label_rtx (); + rtx_code_label *final_label = gen_label_rtx (); + rtx_code_label *begin_compare_label = nullptr; if (base_align < required_align) { /* Generate code that checks distance to 4k boundary for this case. */ begin_compare_label = gen_label_rtx (); - rtx strncmp_label = gen_label_rtx (); + rtx_code_label *strncmp_label = gen_label_rtx (); rtx jmp; /* Strncmp for power8 in glibc does this: diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index bd3250f656be..821aec7797b2 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -9806,12 +9806,12 @@ rs6000_legitimize_tls_address (rtx addr, enum tls_model model) rs6000_emit_move (got, gsym, Pmode); else { - rtx mem, lab; + rtx mem; tmp1 = gen_reg_rtx (Pmode); tmp2 = gen_reg_rtx (Pmode); mem = gen_const_mem (Pmode, tmp1); - lab = gen_label_rtx (); + rtx_code_label *lab = gen_label_rtx (); emit_insn (gen_load_toc_v4_PIC_1b (gsym, lab)); emit_move_insn (tmp1, gen_rtx_REG (Pmode, LR_REGNO)); if (TARGET_LINK_STACK) @@ -15665,7 +15665,7 @@ rs6000_generate_compare (rtx cmp, machine_mode mode) { rtx ne_rtx, normal_dest, unord_dest; rtx unord_func = optab_libfunc (unord_optab, mode); - rtx join_label = gen_label_rtx (); + rtx_code_label *join_label = gen_label_rtx (); rtx join_ref = gen_rtx_LABEL_REF (VOIDmode, join_label); rtx unord_cmp = gen_reg_rtx (comp_mode); @@ -26658,7 +26658,7 @@ rs6000_call_darwin_1 (rtx value, rtx func_desc, rtx tlsarg, if (no_previous_def (funname)) { - rtx label_rtx = gen_label_rtx (); + rtx_code_label *label_rtx = gen_label_rtx (); char *label_buf, temp_buf[256]; ASM_GENERATE_INTERNAL_LABEL (temp_buf, "L", CODE_LABEL_NUMBER (label_rtx)); diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index 7c5c0926c22c..5765a95a34f7 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -1832,7 +1832,7 @@ rtx search_char = operands[2]; rtx align = operands[3]; rtx addr, scratch_string, word1, word2, scratch_dlmzb; - rtx loop_label, end_label, mem, cr0, cond; + rtx mem, cr0, cond; if (search_char != const0_rtx || !CONST_INT_P (align) || INTVAL (align) < 8) @@ -1841,8 +1841,8 @@ word2 = gen_reg_rtx (SImode); scratch_dlmzb = gen_reg_rtx (SImode); scratch_string = gen_reg_rtx (Pmode); - loop_label = gen_label_rtx (); - end_label = gen_label_rtx (); + rtx_code_label *loop_label = gen_label_rtx (); + rtx_code_label *end_label = gen_label_rtx (); addr = force_reg (Pmode, XEXP (src, 0)); emit_move_insn (scratch_string, addr); emit_label (loop_label); @@ -7217,7 +7217,7 @@ rtx val = operands[1]; if (!flag_unsafe_math_optimizations) { - rtx label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); val = gen_reg_rtx (DImode); emit_insn (gen_floatdisf2_internal2 (val, operands[1], label)); emit_label (label); @@ -9414,7 +9414,6 @@ "FLOAT128_IEEE_P (<MODE>mode) || (FLOAT128_IBM_P (<MODE>mode) && TARGET_HARD_FLOAT)" { - rtx label; if (FLOAT128_IEEE_P (<MODE>mode)) { @@ -9433,7 +9432,7 @@ FAIL; } - label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); emit_insn (gen_abs2_internal (<MODE>mode, operands[0], operands[1], label)); emit_label (label); DONE; diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc index 577b0d0c8a20..0336e6e508d6 100644 --- a/gcc/config/s390/s390.cc +++ b/gcc/config/s390/s390.cc @@ -6668,9 +6668,9 @@ s390_expand_vec_strlen (rtx target, rtx string, rtx alignment) rtx str_addr_base_reg = gen_reg_rtx (Pmode); rtx str_idx_reg = gen_reg_rtx (Pmode); rtx result_reg = gen_reg_rtx (V16QImode); - rtx is_aligned_label = gen_label_rtx (); - rtx into_loop_label = NULL_RTX; - rtx loop_start_label = gen_label_rtx (); + rtx_code_label *is_aligned_label = gen_label_rtx (); + rtx_code_label *into_loop_label = nullptr; + rtx_code_label *loop_start_label = gen_label_rtx (); rtx temp; rtx len = gen_reg_rtx (QImode); rtx cond; @@ -6779,10 +6779,10 @@ s390_expand_vec_movstr (rtx result, rtx dst, rtx src) rtx loadlen = gen_reg_rtx (SImode); rtx gpos_qi = gen_reg_rtx(QImode); rtx gpos = gen_reg_rtx (SImode); - rtx done_label = gen_label_rtx (); - rtx loop_label = gen_label_rtx (); - rtx exit_label = gen_label_rtx (); - rtx full_label = gen_label_rtx (); + rtx_code_label *done_label = gen_label_rtx (); + rtx_code_label *loop_label = gen_label_rtx (); + rtx_code_label *exit_label = gen_label_rtx (); + rtx_code_label *full_label = gen_label_rtx (); /* Perform a quick check for string ending on the first up to 16 bytes and exit early if successful. */ @@ -7318,7 +7318,7 @@ s390_expand_cstoreti4 (rtx dst, rtx cmp, rtx op1, rtx op2) gen_rtx_VEC_SELECT (DImode, op1, lane0), gen_rtx_VEC_SELECT (DImode, op2, lane0)))); rtx ccs_reg = gen_rtx_REG (CCSmode, CC_REGNUM); - rtx lab = gen_label_rtx (); + rtx_code_label *lab = gen_label_rtx (); s390_emit_jump (lab, gen_rtx_NE (VOIDmode, ccs_reg, const0_rtx)); /* At this point we have that high(op1) == high(op2). Thus, test the low part, now. For unsigned comparisons @@ -8299,7 +8299,7 @@ s390_expand_int_spaceship (rtx op0, rtx op1, rtx op2, rtx op3) = force_reg (V2DImode, simplify_gen_subreg (V2DImode, op1, TImode, 0)); op2 = force_reg (V2DImode, simplify_gen_subreg (V2DImode, op2, TImode, 0)); - rtx lab = gen_label_rtx (); + rtx_code_label *lab = gen_label_rtx (); rtx ccz = gen_rtx_REG (CCZmode, CC_REGNUM); /* Compare high halves for equality. VEC[L]G op1, op2 sets @@ -8398,10 +8398,10 @@ s390_expand_fp_spaceship (rtx op0, rtx op1, rtx op2, rtx op3) rtx cond_eq = gen_rtx_EQ (mode, cc_reg, const0_rtx); rtx cond_gt = gen_rtx_GT (mode, cc_reg, const0_rtx); rtx_insn *insn; - rtx l_unordered = gen_label_rtx (); - rtx l_eq = gen_label_rtx (); - rtx l_gt = gen_label_rtx (); - rtx l_end = gen_label_rtx (); + rtx_code_label *l_unordered = gen_label_rtx (); + rtx_code_label *l_eq = gen_label_rtx (); + rtx_code_label *l_gt = gen_label_rtx (); + rtx_code_label *l_end = gen_label_rtx (); s390_emit_compare (VOIDmode, LTGT, op1, op2); if (!flag_finite_math_only) @@ -17325,8 +17325,8 @@ s390_rawmemchr (machine_mode elt_mode, rtx dst, rtx src, rtx pat) 16 / GET_MODE_SIZE (elt_mode)).require(); rtx lens = gen_reg_rtx (V16QImode); rtx pattern = gen_reg_rtx (vec_mode); - rtx loop_start = gen_label_rtx (); - rtx loop_end = gen_label_rtx (); + rtx_code_label *loop_start = gen_label_rtx (); + rtx_code_label *loop_end = gen_label_rtx (); rtx addr = gen_reg_rtx (Pmode); rtx offset = gen_reg_rtx (Pmode); rtx loadlen = gen_reg_rtx (SImode); diff --git a/gcc/config/stormy16/stormy16.cc b/gcc/config/stormy16/stormy16.cc index f64ac17aac8b..da6bf3d9ebba 100644 --- a/gcc/config/stormy16/stormy16.cc +++ b/gcc/config/stormy16/stormy16.cc @@ -311,7 +311,7 @@ xstormy16_emit_cbranch (enum rtx_code code, rtx op0, rtx op1, rtx loc) { int unsigned_p = (code == GTU || code == LEU); int gt_p = (code == GT || code == GTU); - rtx lab = NULL_RTX; + rtx_code_label *lab = nullptr; if (gt_p) lab = gen_label_rtx (); @@ -328,7 +328,7 @@ xstormy16_emit_cbranch (enum rtx_code code, rtx op0, rtx op1, rtx loc) && op1 != const0_rtx) { rtx op0_word, op1_word; - rtx lab = NULL_RTX; + rtx_code_label *lab = nullptr; int num_words = GET_MODE_BITSIZE (mode) / BITS_PER_WORD; int i; diff --git a/gcc/config/vax/builtins.md b/gcc/config/vax/builtins.md index 45f45046062a..2af0cbbee1ac 100644 --- a/gcc/config/vax/builtins.md +++ b/gcc/config/vax/builtins.md @@ -37,7 +37,7 @@ "" " { - rtx label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label); rtx cond = gen_rtx_NE (VOIDmode, operands[1], const0_rtx); rtx target = gen_rtx_IF_THEN_ELSE (VOIDmode, cond, label_ref, pc_rtx); @@ -167,12 +167,11 @@ "" " { - rtx label; if (operands[2] != const1_rtx) FAIL; - label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); emit_move_insn (operands[0], const1_rtx); emit_jump_insn (gen_jbbssi<mode> (operands[1], const0_rtx, label)); emit_move_insn (operands[0], const0_rtx); @@ -186,12 +185,11 @@ "" " { - rtx label; if (operands[1] != const0_rtx) FAIL; - label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); emit_jump_insn (gen_jbbcci<mode> (operands[0], const0_rtx, label)); emit_label (label); DONE; diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc index 6ebf8c724533..1f935d33505f 100644 --- a/gcc/config/xtensa/xtensa.cc +++ b/gcc/config/xtensa/xtensa.cc @@ -4030,7 +4030,8 @@ xtensa_set_return_address (rtx address, rtx scratch) rtx xtensa_return_addr (int count, rtx frame) { - rtx result, retaddr, curaddr, label; + rtx result, retaddr, curaddr; + rtx_code_label *label; if (!TARGET_WINDOWED_ABI) { diff --git a/gcc/explow.cc b/gcc/explow.cc index 6acecc701c76..134771446aa5 100644 --- a/gcc/explow.cc +++ b/gcc/explow.cc @@ -2143,7 +2143,7 @@ anti_adjust_stack_and_probe_stack_clash (rtx size) if (residual != CONST0_RTX (Pmode)) { - rtx label = NULL_RTX; + rtx_code_label *label = nullptr; /* RESIDUAL could be zero at runtime and in that case *sp could hold live data. Furthermore, we do not want to probe into the red zone. diff --git a/gcc/rtl-tests.cc b/gcc/rtl-tests.cc index a0c6661818d9..fe7f9e3dda06 100644 --- a/gcc/rtl-tests.cc +++ b/gcc/rtl-tests.cc @@ -119,7 +119,7 @@ test_dumping_insns () ASSERT_RTL_DUMP_EQ ("(cbarrier 0)\n", barrier); /* Labels. */ - rtx_insn *label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); CODE_LABEL_NUMBER (label) = 42; ASSERT_RTL_DUMP_EQ ("(clabel 0 42)\n", label); @@ -199,7 +199,7 @@ static void test_uncond_jump () { set_new_first_and_last_insn (NULL, NULL); - rtx_insn *label = gen_label_rtx (); + rtx_code_label *label = gen_label_rtx (); rtx jump_pat = gen_rtx_SET (pc_rtx, gen_rtx_LABEL_REF (VOIDmode, label));
