[gcc r12-7135] aarch64: Tighten general_operand predicates

[gcc r12-7135] aarch64: Tighten general_operand predicates

[Richard Sandiford]

https://gcc.gnu.org/g:c48a6819d157fd648e77ef5be0dce887e047c734

commit r12-7135-gc48a6819d157fd648e77ef5be0dce887e047c734
Author: Richard Sandiford <richard.sandiford@arm.com>
Date:   Wed Feb 9 16:57:02 2022 +0000

    aarch64: Tighten general_operand predicates
    
    This patch fixes some case in which *general_operand was used over
    *nonimmediate_operand by patterns that don't accept immediates.
    This avoids some complication with later patches.
    
    gcc/
            * config/aarch64/aarch64-simd.md (aarch64_simd_vec_set<mode>): Use
            aarch64_simd_nonimmediate_operand instead of
            aarch64_simd_general_operand.
            (@aarch64_combinez<mode>): Use nonimmediate_operand instead of
            general_operand.
            (@aarch64_combinez_be<mode>): Likewise.

Diff:
---
 gcc/config/aarch64/aarch64-simd.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/config/aarch64/aarch64-simd.md b/gcc/config/aarch64/aarch64-simd.md
index 6646e069ad2..9529bdb4997 100644
--- a/gcc/config/aarch64/aarch64-simd.md
+++ b/gcc/config/aarch64/aarch64-simd.md
@@ -1039,7 +1039,7 @@
   [(set (match_operand:VALL_F16 0 "register_operand" "=w,w,w")
 	(vec_merge:VALL_F16
 	    (vec_duplicate:VALL_F16
-		(match_operand:<VEL> 1 "aarch64_simd_general_operand" "w,?r,Utv"))
+		(match_operand:<VEL> 1 "aarch64_simd_nonimmediate_operand" "w,?r,Utv"))
 	    (match_operand:VALL_F16 3 "register_operand" "0,0,0")
 	    (match_operand:SI 2 "immediate_operand" "i,i,i")))]
   "TARGET_SIMD"
@@ -4380,7 +4380,7 @@
 (define_insn "@aarch64_combinez<mode>"
   [(set (match_operand:<VDBL> 0 "register_operand" "=w,w,w")
 	(vec_concat:<VDBL>
-	  (match_operand:VDC 1 "general_operand" "w,?r,m")
+	  (match_operand:VDC 1 "nonimmediate_operand" "w,?r,m")
 	  (match_operand:VDC 2 "aarch64_simd_or_scalar_imm_zero")))]
   "TARGET_SIMD && !BYTES_BIG_ENDIAN"
   "@
@@ -4395,7 +4395,7 @@
   [(set (match_operand:<VDBL> 0 "register_operand" "=w,w,w")
         (vec_concat:<VDBL>
 	  (match_operand:VDC 2 "aarch64_simd_or_scalar_imm_zero")
-	  (match_operand:VDC 1 "general_operand" "w,?r,m")))]
+	  (match_operand:VDC 1 "nonimmediate_operand" "w,?r,m")))]
   "TARGET_SIMD && BYTES_BIG_ENDIAN"
   "@
    mov\\t%0.8b, %1.8b