https://gcc.gnu.org/g:2f04b9618c20c677b3e02700f529d63f85117daf

commit r17-5859-g2f04b9618c20c677b3e02700f529d63f85117daf
Author: Trevor Saunders <[email protected]>
Date:   Sun Oct 25 08:40:32 2026 +0000

    Split locals that are overwritten with a different rtx
    
    gcc/ChangeLog:
    
            * config/alpha/alpha.cc (alpha_expand_mov_safe_bwa,
            alpha_expand_unaligned_store_safe_partial,
            alpha_expand_unaligned_store_words_safe_partial,
            alpha_expand_clear_safe_partial_nobwx, alpha_split_atomic_op,
            alpha_split_compare_and_swap, alpha_split_compare_and_swap_12,
            alpha_split_atomic_exchange, alpha_split_atomic_exchange_12):
            Keep the code label separate from the LABEL_REF.
            * config/arc/arc.cc (arc_expand_atomic_op): Likewise.
            * config/or1k/or1k.cc (or1k_expand_atomic_compare_and_swap,
            or1k_expand_atomic_compare_and_swap_qihi,
            or1k_expand_atomic_exchange, or1k_expand_atomic_exchange_qihi,
            or1k_expand_atomic_op, or1k_expand_atomic_op_qihi): Likewise.
            * config/or1k/or1k.md (*cmov<I:mode>): Likewise.
            * config/rs6000/rs6000.cc (rs6000_expand_atomic_compare_and_swap,
            rs6000_expand_atomic_exchange, rs6000_expand_atomic_op): Likewise.
            * config/s390/s390.md (indirect_jump, casesi_jump): Likewise.
            * config/arm/aarch-common.cc (arm_mac_accumulator_is_result):
            Keep the producer and consumer patterns in separate locals.
            * config/arm/aarch-common-protos.h (arm_mac_accumulator_is_result):
            Pass an rtx_insn *.
            * config/arm/arm.cc (emit_multi_reg_push): Keep the PARALLEL
            separate from the emitted insn.
            * config/c6x/c6x.cc (reorg_split_calls): Keep each pattern separate
            from the emitted insn.
            * config/ia64/ia64.cc (ia64_spec_check_p): Keep the pattern in a
            separate local.
            * config/nds32/nds32-relax-opt.cc (nds32_pic_tls_symbol_type):
            Likewise.
            * config/rx/rx.cc (mark_frame_related): Likewise.

Diff:
---
 gcc/config/alpha/alpha.cc            | 118 ++++++++++++++++++++---------------
 gcc/config/arc/arc.cc                |   8 +--
 gcc/config/arm/aarch-common-protos.h |   2 +-
 gcc/config/arm/aarch-common.cc       |  40 ++++++------
 gcc/config/arm/arm.cc                |  14 ++---
 gcc/config/c6x/c6x.cc                |  33 +++++-----
 gcc/config/ia64/ia64.cc              |   6 +-
 gcc/config/nds32/nds32-relax-opt.cc  |   4 +-
 gcc/config/or1k/or1k.cc              |  71 +++++++++++----------
 gcc/config/or1k/or1k.md              |   9 +--
 gcc/config/rs6000/rs6000.cc          |  37 ++++++-----
 gcc/config/rx/rx.cc                  |  10 +--
 gcc/config/s390/s390.md              |   6 +-
 13 files changed, 195 insertions(+), 163 deletions(-)

diff --git a/gcc/config/alpha/alpha.cc b/gcc/config/alpha/alpha.cc
index bcf756cfd034..d0fb7eee92fa 100644
--- a/gcc/config/alpha/alpha.cc
+++ b/gcc/config/alpha/alpha.cc
@@ -2427,8 +2427,9 @@ alpha_expand_mov_safe_bwa (machine_mode mode, rtx 
*operands)
     {
       if (aligned_memory_operand (operands[0], mode))
        {
-         rtx label = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-         emit_label (XEXP (label, 0));
+         rtx_code_label *label = gen_label_rtx ();
+         rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
+         emit_label (label);
 
          rtx aligned_mem, bitnum;
          rtx status = gen_reg_rtx (SImode);
@@ -2440,7 +2441,7 @@ alpha_expand_mov_safe_bwa (machine_mode mode, rtx 
*operands)
          rtx cond = gen_rtx_EQ (DImode,
                                 gen_rtx_SUBREG (DImode, status, 0),
                                 const0_rtx);
-         alpha_emit_unlikely_jump (cond, label);
+         alpha_emit_unlikely_jump (cond, label_ref);
        }
       else
        {
@@ -2451,8 +2452,9 @@ alpha_expand_mov_safe_bwa (machine_mode mode, rtx 
*operands)
          emit_insn (gen_rtx_SET (aligned_addr,
                                  gen_rtx_AND (DImode, addr, GEN_INT (-8))));
 
-         rtx label = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-         emit_label (XEXP (label, 0));
+         rtx_code_label *label = gen_label_rtx ();
+         rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
+         emit_label (label);
 
          rtx status = gen_reg_rtx (DImode);
          rtx temp = gen_reg_rtx (DImode);
@@ -2462,7 +2464,7 @@ alpha_expand_mov_safe_bwa (machine_mode mode, rtx 
*operands)
          emit_insn (seq);
 
          rtx cond = gen_rtx_EQ (DImode, status, const0_rtx);
-         alpha_emit_unlikely_jump (cond, label);
+         alpha_emit_unlikely_jump (cond, label_ref);
        }
       return true;
     }
@@ -3916,8 +3918,9 @@ alpha_expand_unaligned_store_safe_partial (rtx dst, rtx 
src,
          gcc_unreachable ();
        }
 
-      rtx labelh = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-      emit_label (XEXP (labelh, 0));
+      rtx_code_label *label = gen_label_rtx ();
+      rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
+      emit_label (label);
 
       rtx dsth = gen_reg_rtx (DImode);
       emit_insn (gen_load_locked (DImode, dsth, memh));
@@ -3951,7 +3954,8 @@ alpha_expand_unaligned_store_safe_partial (rtx dst, rtx 
src,
 
       emit_insn (gen_store_conditional (DImode, dsth, memh, dsth));
 
-      alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, dsth, const0_rtx), labelh);
+      alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, dsth, const0_rtx),
+                               label_ref);
     }
 
   /* Now handle low.  */
@@ -4023,8 +4027,9 @@ alpha_expand_unaligned_store_safe_partial (rtx dst, rtx 
src,
        gcc_unreachable ();
       }
 
-  rtx labell = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-  emit_label (XEXP (labell, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
+  emit_label (label);
 
   rtx dstl = gen_reg_rtx (DImode);
   emit_insn (gen_load_locked (DImode, dstl, meml));
@@ -4062,7 +4067,7 @@ alpha_expand_unaligned_store_safe_partial (rtx dst, rtx 
src,
 
   emit_insn (gen_store_conditional (DImode, dstl, meml, dstl));
 
-  alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, dstl, const0_rtx), labell);
+  alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, dstl, const0_rtx), label_ref);
 }
 
 /* The block move code tries to maximize speed by separating loads and
@@ -4293,8 +4298,9 @@ alpha_expand_unaligned_store_words_safe_partial (rtx 
*data_regs, rtx dmem,
                             expand_simple_binop (Pmode, AND, dreg, im8,
                                                  NULL_RTX, 1, OPTAB_DIRECT));
 
-      rtx label = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-      emit_label (XEXP (label, 0));
+      rtx_code_label *label = gen_label_rtx ();
+      rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
+      emit_label (label);
 
       emit_insn (gen_load_locked (DImode, temp, mem));
       emit_insn (gen_mskql (temp, temp, dreg));
@@ -4303,7 +4309,8 @@ alpha_expand_unaligned_store_words_safe_partial (rtx 
*data_regs, rtx dmem,
                                    temp, 1, OPTAB_DIRECT);
       emit_insn (gen_store_conditional (DImode, temp, mem, temp));
 
-      alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, temp, const0_rtx), label);
+      alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, temp, const0_rtx),
+                               label_ref);
     }
 
   for (i = words - 1; i > 0; --i)
@@ -4327,8 +4334,9 @@ alpha_expand_unaligned_store_words_safe_partial (rtx 
*data_regs, rtx dmem,
                             expand_simple_binop (Pmode, AND, addr, im8,
                                                  NULL_RTX, 1, OPTAB_DIRECT));
 
-      rtx label = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-      emit_label (XEXP (label, 0));
+      rtx_code_label *label = gen_label_rtx ();
+      rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
+      emit_label (label);
 
       emit_insn (gen_load_locked (DImode, temp, mem));
       emit_insn (gen_mskqh (temp, temp, dreg));
@@ -4337,7 +4345,8 @@ alpha_expand_unaligned_store_words_safe_partial (rtx 
*data_regs, rtx dmem,
                                    temp, 1, OPTAB_DIRECT);
       emit_insn (gen_store_conditional (DImode, temp, mem, temp));
 
-      alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, temp, const0_rtx), label);
+      alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, temp, const0_rtx),
+                               label_ref);
     }
 }
 
@@ -4755,8 +4764,9 @@ static void
 alpha_expand_clear_safe_partial_nobwx (rtx mem, machine_mode mode,
                                       HOST_WIDE_INT mask)
 {
-  rtx label = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-  emit_label (XEXP (label, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
+  emit_label (label);
 
   rtx temp = gen_reg_rtx (mode);
   rtx status = mode == DImode ? temp : gen_rtx_SUBREG (DImode, temp, 0);
@@ -4765,7 +4775,7 @@ alpha_expand_clear_safe_partial_nobwx (rtx mem, 
machine_mode mode,
   emit_insn (gen_rtx_SET (temp, gen_rtx_AND (mode, temp, GEN_INT (mask))));
   emit_insn (gen_store_conditional (mode, status, mem, temp));
 
-  alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, status, const0_rtx), label);
+  alpha_emit_unlikely_jump (gen_rtx_EQ (DImode, status, const0_rtx), 
label_ref);
 }
 
 int
@@ -5190,13 +5200,13 @@ alpha_split_atomic_op (enum rtx_code code, rtx mem, rtx 
val, rtx before,
                       rtx after, rtx scratch, enum memmodel model)
 {
   machine_mode mode = GET_MODE (mem);
-  rtx label, x, cond = gen_rtx_REG (DImode, REGNO (scratch));
+  rtx x, cond = gen_rtx_REG (DImode, REGNO (scratch));
 
   alpha_pre_atomic_barrier (model);
 
-  label = gen_label_rtx ();
+  rtx_code_label *label = gen_label_rtx ();
   emit_label (label);
-  label = gen_rtx_LABEL_REF (DImode, label);
+  rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
 
   if (before == NULL)
     before = scratch;
@@ -5218,7 +5228,7 @@ alpha_split_atomic_op (enum rtx_code code, rtx mem, rtx 
val, rtx before,
   emit_insn (gen_store_conditional (mode, cond, mem, scratch));
 
   x = gen_rtx_EQ (DImode, cond, const0_rtx);
-  alpha_emit_unlikely_jump (x, label);
+  alpha_emit_unlikely_jump (x, label_ref);
 
   alpha_post_atomic_barrier (model);
 }
@@ -5232,7 +5242,7 @@ alpha_split_compare_and_swap (rtx operands[])
   bool is_weak;
   enum memmodel mod_s, mod_f;
   machine_mode mode;
-  rtx label1, label2, x;
+  rtx label_ref1, x;
 
   cond = operands[0];
   retval = operands[1];
@@ -5246,13 +5256,15 @@ alpha_split_compare_and_swap (rtx operands[])
 
   alpha_pre_atomic_barrier (mod_s);
 
-  label1 = NULL_RTX;
+  label_ref1 = NULL_RTX;
   if (!is_weak)
     {
-      label1 = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-      emit_label (XEXP (label1, 0));
+      rtx_code_label *label1 = gen_label_rtx ();
+      label_ref1 = gen_rtx_LABEL_REF (DImode, label1);
+      emit_label (label1);
     }
-  label2 = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
+  rtx_code_label *label2 = gen_label_rtx ();
+  rtx label_ref2 = gen_rtx_LABEL_REF (DImode, label2);
 
   emit_insn (gen_load_locked (mode, retval, mem));
 
@@ -5268,7 +5280,7 @@ alpha_split_compare_and_swap (rtx operands[])
       emit_insn (gen_rtx_SET (cond, x));
       x = gen_rtx_EQ (DImode, cond, const0_rtx);
     }
-  alpha_emit_unlikely_jump (x, label2);
+  alpha_emit_unlikely_jump (x, label_ref2);
 
   emit_move_insn (cond, newval);
   emit_insn (gen_store_conditional
@@ -5277,16 +5289,16 @@ alpha_split_compare_and_swap (rtx operands[])
   if (!is_weak)
     {
       x = gen_rtx_EQ (DImode, cond, const0_rtx);
-      alpha_emit_unlikely_jump (x, label1);
+      alpha_emit_unlikely_jump (x, label_ref1);
     }
 
   if (!is_mm_relaxed (mod_f))
-    emit_label (XEXP (label2, 0));
+    emit_label (label2);
 
   alpha_post_atomic_barrier (mod_s);
 
   if (is_mm_relaxed (mod_f))
-    emit_label (XEXP (label2, 0));
+    emit_label (label2);
 }
 
 void
@@ -5333,7 +5345,7 @@ alpha_split_compare_and_swap_12 (rtx operands[])
   machine_mode mode;
   bool is_weak;
   enum memmodel mod_s, mod_f;
-  rtx label1, label2, mem, addr, width, mask, x;
+  rtx label_ref1, mem, addr, width, mask, x;
 
   cond = operands[0];
   dest = operands[1];
@@ -5355,13 +5367,15 @@ alpha_split_compare_and_swap_12 (rtx operands[])
 
   alpha_pre_atomic_barrier (mod_s);
 
-  label1 = NULL_RTX;
+  label_ref1 = NULL_RTX;
   if (!is_weak)
     {
-      label1 = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-      emit_label (XEXP (label1, 0));
+      rtx_code_label *label1 = gen_label_rtx ();
+      label_ref1 = gen_rtx_LABEL_REF (DImode, label1);
+      emit_label (label1);
     }
-  label2 = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
+  rtx_code_label *label2 = gen_label_rtx ();
+  rtx label_ref2 = gen_rtx_LABEL_REF (DImode, label2);
 
   emit_insn (gen_load_locked (DImode, scratch, mem));
 
@@ -5380,7 +5394,7 @@ alpha_split_compare_and_swap_12 (rtx operands[])
       emit_insn (gen_rtx_SET (cond, x));
       x = gen_rtx_EQ (DImode, cond, const0_rtx);
     }
-  alpha_emit_unlikely_jump (x, label2);
+  alpha_emit_unlikely_jump (x, label_ref2);
 
   emit_insn (gen_mskxl (cond, scratch, mask, addr));
 
@@ -5392,16 +5406,16 @@ alpha_split_compare_and_swap_12 (rtx operands[])
   if (!is_weak)
     {
       x = gen_rtx_EQ (DImode, cond, const0_rtx);
-      alpha_emit_unlikely_jump (x, label1);
+      alpha_emit_unlikely_jump (x, label_ref1);
     }
 
   if (!is_mm_relaxed (mod_f))
-    emit_label (XEXP (label2, 0));
+    emit_label (label2);
 
   alpha_post_atomic_barrier (mod_s);
 
   if (is_mm_relaxed (mod_f))
-    emit_label (XEXP (label2, 0));
+    emit_label (label2);
 }
 
 /* Expand an atomic exchange operation.  */
@@ -5412,7 +5426,7 @@ alpha_split_atomic_exchange (rtx operands[])
   rtx retval, mem, val, scratch;
   enum memmodel model;
   machine_mode mode;
-  rtx label, x, cond;
+  rtx x, cond;
 
   retval = operands[0];
   mem = operands[1];
@@ -5424,15 +5438,16 @@ alpha_split_atomic_exchange (rtx operands[])
 
   alpha_pre_atomic_barrier (model);
 
-  label = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-  emit_label (XEXP (label, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
+  emit_label (label);
 
   emit_insn (gen_load_locked (mode, retval, mem));
   emit_move_insn (scratch, val);
   emit_insn (gen_store_conditional (mode, cond, mem, scratch));
 
   x = gen_rtx_EQ (DImode, cond, const0_rtx);
-  alpha_emit_unlikely_jump (x, label);
+  alpha_emit_unlikely_jump (x, label_ref);
 
   alpha_post_atomic_barrier (model);
 }
@@ -5471,7 +5486,7 @@ void
 alpha_split_atomic_exchange_12 (rtx operands[])
 {
   rtx dest, orig_mem, addr, val, align, scratch;
-  rtx label, mem, width, mask, x;
+  rtx mem, width, mask, x;
   machine_mode mode;
   enum memmodel model;
 
@@ -5491,8 +5506,9 @@ alpha_split_atomic_exchange_12 (rtx operands[])
 
   alpha_pre_atomic_barrier (model);
 
-  label = gen_rtx_LABEL_REF (DImode, gen_label_rtx ());
-  emit_label (XEXP (label, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (DImode, label);
+  emit_label (label);
 
   emit_insn (gen_load_locked (DImode, scratch, mem));
 
@@ -5506,7 +5522,7 @@ alpha_split_atomic_exchange_12 (rtx operands[])
   emit_insn (gen_store_conditional (DImode, scratch, mem, scratch));
 
   x = gen_rtx_EQ (DImode, scratch, const0_rtx);
-  alpha_emit_unlikely_jump (x, label);
+  alpha_emit_unlikely_jump (x, label_ref);
 
   alpha_post_atomic_barrier (model);
 }
diff --git a/gcc/config/arc/arc.cc b/gcc/config/arc/arc.cc
index bcd85b4e1b0d..3b4cc342b1cd 100644
--- a/gcc/config/arc/arc.cc
+++ b/gcc/config/arc/arc.cc
@@ -10618,7 +10618,7 @@ arc_expand_atomic_op (enum rtx_code code, rtx mem, rtx 
val,
 {
   enum memmodel model = (enum memmodel) INTVAL (model_rtx);
   machine_mode mode = GET_MODE (mem);
-  rtx label, x, cond;
+  rtx x, cond;
   rtx before = orig_before, after = orig_after;
 
   /* ARC atomic ops work only with 32-bit aligned memories.  */
@@ -10626,9 +10626,9 @@ arc_expand_atomic_op (enum rtx_code code, rtx mem, rtx 
val,
 
   arc_pre_atomic_barrier (model);
 
-  label = gen_label_rtx ();
+  rtx_code_label *label = gen_label_rtx ();
   emit_label (label);
-  label = gen_rtx_LABEL_REF (VOIDmode, label);
+  rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
 
   if (before == NULL_RTX)
     before = gen_reg_rtx (mode);
@@ -10669,7 +10669,7 @@ arc_expand_atomic_op (enum rtx_code code, rtx mem, rtx 
val,
   cond = gen_rtx_REG (CC_Zmode, CC_REG);
   x = gen_rtx_NE (VOIDmode, cond, const0_rtx);
   x = gen_rtx_IF_THEN_ELSE (VOIDmode, x,
-                           label, pc_rtx);
+                           label_ref, pc_rtx);
   emit_unlikely_jump (gen_rtx_SET (pc_rtx, x));
 
   arc_post_atomic_barrier (model);
diff --git a/gcc/config/arm/aarch-common-protos.h 
b/gcc/config/arm/aarch-common-protos.h
index 93e25d026cdc..2ddc1a106e4f 100644
--- a/gcc/config/arm/aarch-common-protos.h
+++ b/gcc/config/arm/aarch-common-protos.h
@@ -36,7 +36,7 @@ extern int arm_early_load_addr_dep_ptr (rtx_insn *, rtx_insn 
*);
 extern int arm_early_store_addr_dep (rtx_insn *, rtx_insn *);
 extern int arm_early_store_addr_dep_ptr (rtx_insn *, rtx_insn *);
 extern int arm_mac_accumulator_is_mul_result (rtx_insn *, rtx_insn *);
-extern int arm_mac_accumulator_is_result (rtx, rtx);
+extern int arm_mac_accumulator_is_result (rtx_insn *, rtx_insn *);
 extern int arm_no_early_alu_shift_dep (rtx_insn *, rtx_insn *);
 extern int arm_no_early_alu_shift_value_dep (rtx_insn *, rtx_insn *);
 extern int arm_no_early_mul_dep (rtx_insn *, rtx_insn *);
diff --git a/gcc/config/arm/aarch-common.cc b/gcc/config/arm/aarch-common.cc
index e80bc196103c..54f79540f475 100644
--- a/gcc/config/arm/aarch-common.cc
+++ b/gcc/config/arm/aarch-common.cc
@@ -365,48 +365,48 @@ arm_early_store_addr_dep_ptr (rtx_insn *producer, 
rtx_insn *consumer)
    result of the producer and no other dependency on that result.  It
    does not check if the producer is multiply-accumulate instruction.  */
 int
-arm_mac_accumulator_is_result (rtx producer, rtx consumer)
+arm_mac_accumulator_is_result (rtx_insn *producer, rtx_insn *consumer)
 {
   rtx result;
   rtx op0, op1, acc;
 
-  producer = PATTERN (producer);
-  consumer = PATTERN (consumer);
+  rtx producer_pat = PATTERN (producer);
+  rtx consumer_pat = PATTERN (consumer);
 
-  if (GET_CODE (producer) == COND_EXEC)
-    producer = COND_EXEC_CODE (producer);
-  if (GET_CODE (consumer) == COND_EXEC)
-    consumer = COND_EXEC_CODE (consumer);
+  if (GET_CODE (producer_pat) == COND_EXEC)
+    producer_pat = COND_EXEC_CODE (producer_pat);
+  if (GET_CODE (consumer_pat) == COND_EXEC)
+    consumer_pat = COND_EXEC_CODE (consumer_pat);
 
-  if (GET_CODE (producer) != SET)
+  if (GET_CODE (producer_pat) != SET)
     return 0;
 
-  result = XEXP (producer, 0);
+  result = XEXP (producer_pat, 0);
 
-  if (GET_CODE (consumer) != SET)
+  if (GET_CODE (consumer_pat) != SET)
     return 0;
 
   /* Check that the consumer is of the form
      (set (...) (plus (mult ...) (...)))
      or
      (set (...) (minus (...) (mult ...))).  */
-  if (GET_CODE (XEXP (consumer, 1)) == PLUS)
+  if (GET_CODE (XEXP (consumer_pat, 1)) == PLUS)
     {
-      if (GET_CODE (XEXP (XEXP (consumer, 1), 0)) != MULT)
+      if (GET_CODE (XEXP (XEXP (consumer_pat, 1), 0)) != MULT)
         return 0;
 
-      op0 = XEXP (XEXP (XEXP (consumer, 1), 0), 0);
-      op1 = XEXP (XEXP (XEXP (consumer, 1), 0), 1);
-      acc = XEXP (XEXP (consumer, 1), 1);
+      op0 = XEXP (XEXP (XEXP (consumer_pat, 1), 0), 0);
+      op1 = XEXP (XEXP (XEXP (consumer_pat, 1), 0), 1);
+      acc = XEXP (XEXP (consumer_pat, 1), 1);
     }
-  else if (GET_CODE (XEXP (consumer, 1)) == MINUS)
+  else if (GET_CODE (XEXP (consumer_pat, 1)) == MINUS)
     {
-      if (GET_CODE (XEXP (XEXP (consumer, 1), 1)) != MULT)
+      if (GET_CODE (XEXP (XEXP (consumer_pat, 1), 1)) != MULT)
         return 0;
 
-      op0 = XEXP (XEXP (XEXP (consumer, 1), 1), 0);
-      op1 = XEXP (XEXP (XEXP (consumer, 1), 1), 1);
-      acc = XEXP (XEXP (consumer, 1), 0);
+      op0 = XEXP (XEXP (XEXP (consumer_pat, 1), 1), 0);
+      op1 = XEXP (XEXP (XEXP (consumer_pat, 1), 1), 1);
+      acc = XEXP (XEXP (consumer_pat, 1), 0);
     }
   else
     return 0;
diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc
index 4fc589a5ae75..fedae2db85b4 100644
--- a/gcc/config/arm/arm.cc
+++ b/gcc/config/arm/arm.cc
@@ -21346,7 +21346,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long 
dwarf_regs_mask)
   int num_regs = 0;
   int num_dwarf_regs = 0;
   int i, j;
-  rtx par;
+  rtx_insn *par;
   rtx dwarf;
   int dwarf_par_index;
   rtx tmp, reg;
@@ -21405,7 +21405,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long 
dwarf_regs_mask)
 
      For more see PR43399.  */
 
-  par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (num_regs));
+  rtx parallel = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (num_regs));
   dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (num_dwarf_regs + 1));
   dwarf_par_index = 1;
 
@@ -21441,7 +21441,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long 
dwarf_regs_mask)
          if (arm_current_function_pac_enabled_p () && i == IP_REGNUM)
            dwarf_reg = gen_rtx_REG (SImode, RA_AUTH_CODE);
 
-         XVECEXP (par, 0, 0)
+         XVECEXP (parallel, 0, 0)
            = gen_rtx_SET (gen_frame_mem
                           (BLKmode,
                            gen_rtx_PRE_MODIFY (Pmode,
@@ -21474,7 +21474,7 @@ emit_multi_reg_push (unsigned long mask, unsigned long 
dwarf_regs_mask)
          if (arm_current_function_pac_enabled_p () && i == IP_REGNUM)
            dwarf_reg = gen_rtx_REG (SImode, RA_AUTH_CODE);
 
-         XVECEXP (par, 0, j) = gen_rtx_USE (VOIDmode, reg);
+         XVECEXP (parallel, 0, j) = gen_rtx_USE (VOIDmode, reg);
 
          if (dwarf_regs_mask & (1 << i))
            {
@@ -21492,16 +21492,16 @@ emit_multi_reg_push (unsigned long mask, unsigned 
long dwarf_regs_mask)
        }
     }
 
-  rtx_insn *insn = emit_insn (par);
+  par = emit_insn (parallel);
 
   tmp = gen_rtx_SET (stack_pointer_rtx,
                     plus_constant (Pmode, stack_pointer_rtx, -4 * num_regs));
   RTX_FRAME_RELATED_P (tmp) = 1;
   XVECEXP (dwarf, 0, 0) = tmp;
 
-  add_reg_note (insn, REG_FRAME_RELATED_EXPR, dwarf);
+  add_reg_note (par, REG_FRAME_RELATED_EXPR, dwarf);
 
-  return insn;
+  return par;
 }
 
 /* Add a REG_CFA_ADJUST_CFA REG note to INSN.
diff --git a/gcc/config/c6x/c6x.cc b/gcc/config/c6x/c6x.cc
index 2480abdb3969..b96149b0248f 100644
--- a/gcc/config/c6x/c6x.cc
+++ b/gcc/config/c6x/c6x.cc
@@ -4938,13 +4938,14 @@ reorg_split_calls (rtx_code_label **call_labels)
              if (TARGET_INSNS_64)
                {
                  rtx x1 = gen_addkpc (reg, labelref, const0_rtx);
-                 x1 = emit_insn_after (duplicate_cond (x1, insn), after1);
-                 insn_set_clock (x1, this_clock + 1);
-                 INSN_INFO_ENTRY (INSN_UID (x1)).reservation = RESERVATION_S2;
+                 rtx_insn *i1
+                   = emit_insn_after (duplicate_cond (x1, insn), after1);
+                 insn_set_clock (i1, this_clock + 1);
+                 INSN_INFO_ENTRY (INSN_UID (i1)).reservation = RESERVATION_S2;
                  if (after1 == last_same_clock)
-                   PUT_MODE (x1, TImode);
+                   PUT_MODE (i1, TImode);
                  else
-                   INSN_INFO_ENTRY (INSN_UID (x1)).unit_mask
+                   INSN_INFO_ENTRY (INSN_UID (i1)).unit_mask
                      = INSN_INFO_ENTRY (INSN_UID (after1)).unit_mask;
                }
              else
@@ -4955,22 +4956,24 @@ reorg_split_calls (rtx_code_label **call_labels)
                  if (after2 == NULL_RTX)
                    after2 = after1;
                  x2 = gen_movsi_lo_sum (reg, reg, labelref);
-                 x2 = emit_insn_after (duplicate_cond (x2, insn), after2);
+                 rtx_insn *i2
+                   = emit_insn_after (duplicate_cond (x2, insn), after2);
                  x1 = gen_movsi_high (reg, labelref);
-                 x1 = emit_insn_after (duplicate_cond (x1, insn), after1);
-                 insn_set_clock (x1, this_clock + 1);
-                 insn_set_clock (x2, this_clock + 2);
-                 INSN_INFO_ENTRY (INSN_UID (x1)).reservation = RESERVATION_S2;
-                 INSN_INFO_ENTRY (INSN_UID (x2)).reservation = RESERVATION_S2;
+                 rtx_insn *i1
+                   = emit_insn_after (duplicate_cond (x1, insn), after1);
+                 insn_set_clock (i1, this_clock + 1);
+                 insn_set_clock (i2, this_clock + 2);
+                 INSN_INFO_ENTRY (INSN_UID (i1)).reservation = RESERVATION_S2;
+                 INSN_INFO_ENTRY (INSN_UID (i2)).reservation = RESERVATION_S2;
                  if (after1 == last_same_clock)
-                   PUT_MODE (x1, TImode);
+                   PUT_MODE (i1, TImode);
                  else
-                   INSN_INFO_ENTRY (INSN_UID (x1)).unit_mask
+                   INSN_INFO_ENTRY (INSN_UID (i1)).unit_mask
                      = INSN_INFO_ENTRY (INSN_UID (after1)).unit_mask;
                  if (after1 == after2)
-                   PUT_MODE (x2, TImode);
+                   PUT_MODE (i2, TImode);
                  else
-                   INSN_INFO_ENTRY (INSN_UID (x2)).unit_mask
+                   INSN_INFO_ENTRY (INSN_UID (i2)).unit_mask
                      = INSN_INFO_ENTRY (INSN_UID (after2)).unit_mask;
                }
            }
diff --git a/gcc/config/ia64/ia64.cc b/gcc/config/ia64/ia64.cc
index 9ed9118b435f..9ee3ab5ed408 100644
--- a/gcc/config/ia64/ia64.cc
+++ b/gcc/config/ia64/ia64.cc
@@ -178,7 +178,7 @@ static bool ia64_skip_rtx_p (const_rtx);
 static int ia64_speculate_insn (rtx_insn *, ds_t, rtx *);
 static bool ia64_needs_block_p (ds_t);
 static rtx ia64_gen_spec_check (rtx_insn *, rtx_insn *, ds_t);
-static int ia64_spec_check_p (rtx);
+static int ia64_spec_check_p (rtx_insn *);
 static int ia64_spec_check_src_p (rtx);
 static rtx gen_tls_get_addr (void);
 static rtx gen_thread_pointer (void);
@@ -8573,9 +8573,9 @@ ia64_gen_spec_check (rtx_insn *insn, rtx_insn *label, 
ds_t ds)
 
 /* Return nonzero, if X is branchy recovery check.  */
 static int
-ia64_spec_check_p (rtx x)
+ia64_spec_check_p (rtx_insn *insn)
 {
-  x = PATTERN (x);
+  rtx x = PATTERN (insn);
   if (GET_CODE (x) == COND_EXEC)
     x = COND_EXEC_CODE (x);
   if (GET_CODE (x) == SET)
diff --git a/gcc/config/nds32/nds32-relax-opt.cc 
b/gcc/config/nds32/nds32-relax-opt.cc
index 0ce43df5bb7d..e742f61fa2b4 100644
--- a/gcc/config/nds32/nds32-relax-opt.cc
+++ b/gcc/config/nds32/nds32-relax-opt.cc
@@ -291,9 +291,9 @@ nds32_pic_tls_group (rtx_insn *def_insn,
 }
 
 static int
-nds32_pic_tls_symbol_type (rtx x)
+nds32_pic_tls_symbol_type (rtx_insn *insn)
 {
-  x = XEXP (SET_SRC (PATTERN (x)), 1);
+  rtx x = XEXP (SET_SRC (PATTERN (insn)), 1);
 
   if (GET_CODE (x) == CONST)
     {
diff --git a/gcc/config/or1k/or1k.cc b/gcc/config/or1k/or1k.cc
index 52dbb57a51c5..58aba7e89b13 100644
--- a/gcc/config/or1k/or1k.cc
+++ b/gcc/config/or1k/or1k.cc
@@ -1837,7 +1837,7 @@ void
 or1k_expand_atomic_compare_and_swap (rtx operands[])
 {
   rtx boolval, retval, mem, oldval, newval;
-  rtx label1, label2;
+  rtx label_ref1;
   machine_mode mode;
   bool is_weak;
 
@@ -1852,24 +1852,26 @@ or1k_expand_atomic_compare_and_swap (rtx operands[])
   if (reg_overlap_mentioned_p (retval, oldval))
     oldval = copy_to_reg (oldval);
 
-  label1 = NULL_RTX;
+  label_ref1 = NULL_RTX;
   /* If strong, create a label to try again.  */
   if (!is_weak)
     {
-      label1 = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-      emit_label (XEXP (label1, 0));
+      rtx_code_label *label1 = gen_label_rtx ();
+      label_ref1 = gen_rtx_LABEL_REF (VOIDmode, label1);
+      emit_label (label1);
     }
-  label2 = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
+  rtx_code_label *label2 = gen_label_rtx ();
+  rtx label_ref2 = gen_rtx_LABEL_REF (VOIDmode, label2);
 
   emit_load_locked (mode, retval, mem);
   emit_compare (EQ, retval, oldval);
-  emit_unlikely_jump (EQ, label2);
+  emit_unlikely_jump (EQ, label_ref2);
   emit_store_conditional (mode, mem, newval);
 
   /* If strong, jump back to try again on fails.  */
   if (!is_weak)
-    emit_unlikely_jump (EQ, label1);
-  emit_label (XEXP (label2, 0));
+    emit_unlikely_jump (EQ, label_ref1);
+  emit_label (label2);
 
   /* In all cases, SR_F contains 1 on success, and 0 on failure.  */
   emit_insn (gen_sne_sr_f (boolval));
@@ -1879,7 +1881,7 @@ void
 or1k_expand_atomic_compare_and_swap_qihi (rtx operands[])
 {
   rtx boolval, orig_retval, retval, scratch, mem, oldval, newval;
-  rtx label1, label2, mask, shift;
+  rtx label_ref1, mask, shift;
   machine_mode mode;
   bool is_weak;
 
@@ -1907,13 +1909,15 @@ or1k_expand_atomic_compare_and_swap_qihi (rtx 
operands[])
                             NULL_RTX, 1, OPTAB_LIB_WIDEN);
     }
 
-  label1 = NULL_RTX;
+  label_ref1 = NULL_RTX;
   if (!is_weak)
     {
-      label1 = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-      emit_label (XEXP (label1, 0));
+      rtx_code_label *label1 = gen_label_rtx ();
+      label_ref1 = gen_rtx_LABEL_REF (VOIDmode, label1);
+      emit_label (label1);
     }
-  label2 = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
+  rtx_code_label *label2 = gen_label_rtx ();
+  rtx label_ref2 = gen_rtx_LABEL_REF (VOIDmode, label2);
 
   scratch = gen_reg_rtx (SImode);
   emit_load_locked (SImode, scratch, mem);
@@ -1924,7 +1928,7 @@ or1k_expand_atomic_compare_and_swap_qihi (rtx operands[])
                          scratch, 1, OPTAB_LIB_WIDEN);
 
   emit_compare (EQ, retval, oldval);
-  emit_unlikely_jump (EQ, label2);
+  emit_unlikely_jump (EQ, label_ref2);
 
   if (newval != const0_rtx)
     scratch = expand_binop (SImode, ior_optab, scratch, newval,
@@ -1933,8 +1937,8 @@ or1k_expand_atomic_compare_and_swap_qihi (rtx operands[])
   emit_store_conditional (SImode, mem, scratch);
 
   if (!is_weak)
-    emit_unlikely_jump (EQ, label1);
-  emit_label (XEXP (label2, 0));
+    emit_unlikely_jump (EQ, label_ref1);
+  emit_label (label2);
 
   or1k_finish_atomic_subword (mode, orig_retval, retval, shift);
 
@@ -1955,7 +1959,7 @@ or1k_expand_atomic_compare_and_swap_qihi (rtx operands[])
 void
 or1k_expand_atomic_exchange (rtx operands[])
 {
-  rtx retval, mem, val, label;
+  rtx retval, mem, val;
   machine_mode mode;
 
   retval = operands[0];
@@ -1966,19 +1970,20 @@ or1k_expand_atomic_exchange (rtx operands[])
   if (reg_overlap_mentioned_p (retval, val))
     val = copy_to_reg (val);
 
-  label = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-  emit_label (XEXP (label, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
+  emit_label (label);
 
   emit_load_locked (mode, retval, mem);
   emit_store_conditional (mode, mem, val);
-  emit_unlikely_jump (EQ, label);
+  emit_unlikely_jump (EQ, label_ref);
 }
 
 void
 or1k_expand_atomic_exchange_qihi (rtx operands[])
 {
   rtx orig_retval, retval, mem, val, scratch;
-  rtx label, mask, shift;
+  rtx mask, shift;
   machine_mode mode;
 
   orig_retval = operands[0];
@@ -1996,8 +2001,9 @@ or1k_expand_atomic_exchange_qihi (rtx operands[])
                          NULL_RTX, 1, OPTAB_LIB_WIDEN);
     }
 
-  label = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-  emit_label (XEXP (label, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
+  emit_label (label);
 
   scratch = gen_reg_rtx (SImode);
   emit_load_locked (SImode, scratch, mem);
@@ -2011,7 +2017,7 @@ or1k_expand_atomic_exchange_qihi (rtx operands[])
                            scratch, 1, OPTAB_LIB_WIDEN);
 
   emit_store_conditional (SImode, mem, scratch);
-  emit_unlikely_jump (EQ, label);
+  emit_unlikely_jump (EQ, label_ref);
 
   or1k_finish_atomic_subword (mode, orig_retval, retval, shift);
 }
@@ -2028,10 +2034,10 @@ or1k_expand_atomic_op (rtx_code code, rtx mem, rtx val,
 {
   machine_mode mode = GET_MODE (mem);
   rtx before = orig_before, after = orig_after;
-  rtx label;
 
-  label = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-  emit_label (XEXP (label, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
+  emit_label (label);
 
   if (before == NULL_RTX)
     before = gen_reg_rtx (mode);
@@ -2049,7 +2055,7 @@ or1k_expand_atomic_op (rtx_code code, rtx mem, rtx val,
                                 after, 1, OPTAB_LIB_WIDEN);
 
   emit_store_conditional (mode, mem, after);
-  emit_unlikely_jump (EQ, label);
+  emit_unlikely_jump (EQ, label_ref);
 
   if (orig_before)
     emit_move_insn (orig_before, before);
@@ -2062,7 +2068,7 @@ or1k_expand_atomic_op_qihi (rtx_code code, rtx mem, rtx 
val,
                            rtx orig_before, rtx orig_after)
 {
   machine_mode mode = GET_MODE (mem);
-  rtx label, mask, shift, x;
+  rtx mask, shift, x;
   rtx before, after, scratch;
 
   mem = or1k_adjust_atomic_subword (mem, &shift, &mask);
@@ -2099,8 +2105,9 @@ or1k_expand_atomic_op_qihi (rtx_code code, rtx mem, rtx 
val,
       gcc_unreachable ();
     }
 
-  label = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-  emit_label (XEXP (label, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
+  emit_label (label);
 
   before = scratch = gen_reg_rtx (SImode);
   emit_load_locked (SImode, before, mem);
@@ -2142,7 +2149,7 @@ or1k_expand_atomic_op_qihi (rtx_code code, rtx mem, rtx 
val,
     }
 
   emit_store_conditional (SImode, mem, scratch);
-  emit_unlikely_jump (EQ, label);
+  emit_unlikely_jump (EQ, label_ref);
 
   if (orig_before)
     or1k_finish_atomic_subword (mode, orig_before, before, shift);
diff --git a/gcc/config/or1k/or1k.md b/gcc/config/or1k/or1k.md
index 1af29f247d31..b43ec408f23e 100644
--- a/gcc/config/or1k/or1k.md
+++ b/gcc/config/or1k/or1k.md
@@ -583,25 +583,26 @@
   [(const_int 0)]
 {
   rtx x;
-  rtx label = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
 
   /* Generated a *cbranch pattern.  */
   if (rtx_equal_p (operands[0], operands[2]))
     {
       PUT_CODE (operands[3], (GET_CODE (operands[3]) == NE) ? EQ : NE);
-      x = gen_rtx_IF_THEN_ELSE (VOIDmode, operands[3], label, pc_rtx);
+      x = gen_rtx_IF_THEN_ELSE (VOIDmode, operands[3], label_ref, pc_rtx);
       emit_jump_insn (gen_rtx_SET (pc_rtx, x));
       emit_move_insn (operands[0], operands[1]);
     }
   else
     {
-      x = gen_rtx_IF_THEN_ELSE (VOIDmode, operands[3], label, pc_rtx);
+      x = gen_rtx_IF_THEN_ELSE (VOIDmode, operands[3], label_ref, pc_rtx);
       emit_move_insn (operands[0], operands[1]);
       emit_jump_insn (gen_rtx_SET (pc_rtx, x));
       emit_move_insn (operands[0], operands[2]);
     }
 
-  emit_label (XEXP (label, 0));
+  emit_label (label);
   DONE;
 })
 
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 0ae1af96f307..a957a13c2713 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -17151,7 +17151,7 @@ void
 rs6000_expand_atomic_compare_and_swap (rtx operands[], bool local)
 {
   rtx boolval, retval, mem, oldval, newval, cond;
-  rtx label1, label2, x, mask, shift;
+  rtx label_ref1, x, mask, shift;
   machine_mode mode, orig_mode;
   enum memmodel mod_s, mod_f;
   bool is_weak;
@@ -17203,13 +17203,15 @@ rs6000_expand_atomic_compare_and_swap (rtx 
operands[], bool local)
 
   mem = rs6000_pre_atomic_barrier (mem, mod_s);
 
-  label1 = NULL_RTX;
+  label_ref1 = NULL_RTX;
   if (!is_weak)
     {
-      label1 = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-      emit_label (XEXP (label1, 0));
+      rtx_code_label *label1 = gen_label_rtx ();
+      label_ref1 = gen_rtx_LABEL_REF (VOIDmode, label1);
+      emit_label (label1);
     }
-  label2 = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
+  rtx_code_label *label2 = gen_label_rtx ();
+  rtx label_ref2 = gen_rtx_LABEL_REF (VOIDmode, label2);
 
   emit_load_locked (mode, retval, mem, local ? const1_rtx : const0_rtx);
 
@@ -17241,7 +17243,7 @@ rs6000_expand_atomic_compare_and_swap (rtx operands[], 
bool local)
   emit_insn (gen_rtx_SET (cond, x));
 
   x = gen_rtx_NE (VOIDmode, cond, const0_rtx);
-  emit_unlikely_jump (x, label2);
+  emit_unlikely_jump (x, label_ref2);
 
   x = newval;
   if (mask)
@@ -17252,16 +17254,16 @@ rs6000_expand_atomic_compare_and_swap (rtx 
operands[], bool local)
   if (!is_weak)
     {
       x = gen_rtx_NE (VOIDmode, cond, const0_rtx);
-      emit_unlikely_jump (x, label1);
+      emit_unlikely_jump (x, label_ref1);
     }
 
   if (!is_mm_relaxed (mod_f))
-    emit_label (XEXP (label2, 0));
+    emit_label (label2);
 
   rs6000_post_atomic_barrier (mod_s);
 
   if (is_mm_relaxed (mod_f))
-    emit_label (XEXP (label2, 0));
+    emit_label (label2);
 
   if (shift)
     rs6000_finish_atomic_subword (operands[1], retval, shift);
@@ -17281,7 +17283,7 @@ rs6000_expand_atomic_exchange (rtx operands[])
   rtx retval, mem, val, cond;
   machine_mode mode;
   enum memmodel model;
-  rtx label, x, mask, shift;
+  rtx x, mask, shift;
 
   retval = operands[0];
   mem = operands[1];
@@ -17306,8 +17308,9 @@ rs6000_expand_atomic_exchange (rtx operands[])
 
   mem = rs6000_pre_atomic_barrier (mem, model);
 
-  label = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
-  emit_label (XEXP (label, 0));
+  rtx_code_label *label = gen_label_rtx ();
+  rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
+  emit_label (label);
 
   emit_load_locked (mode, retval, mem, const0_rtx);
 
@@ -17319,7 +17322,7 @@ rs6000_expand_atomic_exchange (rtx operands[])
   emit_store_conditional (mode, cond, mem, x);
 
   x = gen_rtx_NE (VOIDmode, cond, const0_rtx);
-  emit_unlikely_jump (x, label);
+  emit_unlikely_jump (x, label_ref);
 
   rs6000_post_atomic_barrier (model);
 
@@ -17340,7 +17343,7 @@ rs6000_expand_atomic_op (enum rtx_code code, rtx mem, 
rtx val,
   enum memmodel model = memmodel_base (INTVAL (model_rtx));
   machine_mode mode = GET_MODE (mem);
   machine_mode store_mode = mode;
-  rtx label, x, cond, mask, shift;
+  rtx x, cond, mask, shift;
   rtx before = orig_before, after = orig_after;
 
   mask = shift = NULL_RTX;
@@ -17407,9 +17410,9 @@ rs6000_expand_atomic_op (enum rtx_code code, rtx mem, 
rtx val,
 
   mem = rs6000_pre_atomic_barrier (mem, model);
 
-  label = gen_label_rtx ();
+  rtx_code_label *label = gen_label_rtx ();
   emit_label (label);
-  label = gen_rtx_LABEL_REF (VOIDmode, label);
+  rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
 
   if (before == NULL_RTX)
     before = gen_reg_rtx (mode);
@@ -17442,7 +17445,7 @@ rs6000_expand_atomic_op (enum rtx_code code, rtx mem, 
rtx val,
   emit_store_conditional (store_mode, cond, mem, x);
 
   x = gen_rtx_NE (VOIDmode, cond, const0_rtx);
-  emit_unlikely_jump (x, label);
+  emit_unlikely_jump (x, label_ref);
 
   rs6000_post_atomic_barrier (model);
 
diff --git a/gcc/config/rx/rx.cc b/gcc/config/rx/rx.cc
index 4a38a6fef28a..da52845a2f49 100644
--- a/gcc/config/rx/rx.cc
+++ b/gcc/config/rx/rx.cc
@@ -1662,17 +1662,17 @@ gen_rx_store_vector (unsigned int low, unsigned int 
high)
    then mark each element as being frame related as well.  */
 
 static void
-mark_frame_related (rtx insn)
+mark_frame_related (rtx_insn *insn)
 {
   RTX_FRAME_RELATED_P (insn) = 1;
-  insn = PATTERN (insn);
+  rtx body = PATTERN (insn);
 
-  if (GET_CODE (insn) == PARALLEL)
+  if (GET_CODE (body) == PARALLEL)
     {
       unsigned int i;
 
-      for (i = 0; i < (unsigned) XVECLEN (insn, 0); i++)
-       RTX_FRAME_RELATED_P (XVECEXP (insn, 0, i)) = 1;
+      for (i = 0; i < (unsigned) XVECLEN (body, 0); i++)
+       RTX_FRAME_RELATED_P (XVECEXP (body, 0, i)) = 1;
     }
 }
 
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 389204bfabc7..19aae54fd7ce 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -9688,7 +9688,8 @@
   if (TARGET_INDIRECT_BRANCH_NOBP_JUMP_INLINE_THUNK)
     {
       operands[0] = force_reg (Pmode, operands[0]);
-      rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
+      rtx_code_label *label = gen_label_rtx ();
+      rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
       if (TARGET_CPU_Z10)
        emit_jump_insn (gen_indirect_jump_via_inlinethunkdi_z10 (operands[0],
                                                                 label_ref));
@@ -9829,7 +9830,8 @@
     if (TARGET_INDIRECT_BRANCH_NOBP_JUMP_INLINE_THUNK)
     {
       operands[0] = force_reg (Pmode, operands[0]);
-      rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, gen_label_rtx ());
+      rtx_code_label *label = gen_label_rtx ();
+      rtx label_ref = gen_rtx_LABEL_REF (VOIDmode, label);
       if (TARGET_CPU_Z10)
        emit_jump_insn (gen_casesi_jump_via_inlinethunkdi_z10 (operands[0],
                                                               operands[1],

Reply via email to