rs6000: Don't use operands[] for temporaries in define_expand

In ac001f5ce604 Alan fixed my thinko using operands that do not refer
to anything mentioned in the RTL pattern.  Instead, it just uses fresh
new local rtxes for those.

This patch takes that a tiny bit further: it uses local rtx for all
temporaries used in the expanders.  As a bonus that simplifies the code
a tiny bit as well.

2020-11-06  Segher Boessenkool  <segher@kernel.crashing.org>

	* config/rs6000/rs6000.md (@tablejump<mode>_normal): Don't abuse
	operands[].
	(@tablejump<mode>_nospec): Ditto.

diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index acbf130..5e5ad9f 100644 (file)
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -12732,14 +12732,11 @@
    (use (match_operand:P 1))]
   "rs6000_speculate_indirect_jumps"
 {
-  rtx off;
-  operands[0] = force_reg (SImode, operands[0]);
-  if (<MODE>mode == SImode)
-    off = operands[0];
-  else
+  rtx off = force_reg (SImode, operands[0]);
+  if (<MODE>mode != SImode)
     {
+      rtx src = gen_rtx_fmt_e (SIGN_EXTEND, Pmode, off);
       off = gen_reg_rtx (Pmode);
-      rtx src = gen_rtx_fmt_e (SIGN_EXTEND, Pmode, operands[0]);
       emit_move_insn (off, src);
     }
 
@@ -12757,14 +12754,11 @@
    (use (match_operand:CC 2))]
   "!rs6000_speculate_indirect_jumps"
 {
-  rtx off;
-  operands[0] = force_reg (SImode, operands[0]);
-  if (<MODE>mode == SImode)
-    off = operands[0];
-  else
+  rtx off = force_reg (SImode, operands[0]);
+  if (<MODE>mode != SImode)
     {
+      rtx src = gen_rtx_fmt_e (SIGN_EXTEND, Pmode, off);
       off = gen_reg_rtx (Pmode);
-      rtx src = gen_rtx_fmt_e (SIGN_EXTEND, Pmode, operands[0]);
       emit_move_insn (off, src);
     }