]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
[PR99663] Don't use unknown constraint for address constraint in process_address_1.
authorVladimir N. Makarov <vmakarov@redhat.com>
Fri, 19 Mar 2021 19:34:48 +0000 (15:34 -0400)
committerVladimir N. Makarov <vmakarov@redhat.com>
Fri, 19 Mar 2021 19:34:48 +0000 (15:34 -0400)
s390x has insns using several alternatives with address constraints.  Even
if we don't know at this stage what alternative will be used, we still can say
that is an address constraint.  So don't use unknown constraint in this
case when there are multiple constraints or/and alternative.

gcc/ChangeLog:

PR target/99663
* lra-constraints.c (process_address_1): Don't use unknown
constraint for address constraint.

gcc/testsuite/ChangeLog:

PR target/99663
* gcc.target/s390/pr99663.c: New.

gcc/lra-constraints.c
gcc/testsuite/gcc.target/s390/pr99663.c [new file with mode: 0644]

index 64801b6fccedb003230444d915cce4d6334b6b15..698d8d04a1e49311ef050a70cdc2a1ed7bd250c0 100644 (file)
@@ -3459,12 +3459,17 @@ process_address_1 (int nop, bool check_only_p,
       constraint
        = skip_contraint_modifiers (curr_static_id->operand[dup].constraint);
     }
-  if (*skip_contraint_modifiers (constraint
-                                + CONSTRAINT_LEN (constraint[0],
-                                                  constraint)) != '\0')
+  cn = lookup_constraint (*constraint == '\0' ? "X" : constraint);
+  /* If we have several alternatives or/and several constraints in an
+     alternative and we can not say at this stage what constraint will be used,
+     use unknown constraint.  The exception is an address constraint.  If
+     operand has one address constraint, probably all others constraints are
+     address ones.  */
+  if (get_constraint_type (cn) != CT_ADDRESS
+      && *skip_contraint_modifiers (constraint
+                                   + CONSTRAINT_LEN (constraint[0],
+                                                     constraint)) != '\0')
     cn = CONSTRAINT__UNKNOWN;
-  else
-    cn = lookup_constraint (*constraint == '\0' ? "X" : constraint);
   if (insn_extra_address_constraint (cn)
       /* When we find an asm operand with an address constraint that
         doesn't satisfy address_operand to begin with, we clear
diff --git a/gcc/testsuite/gcc.target/s390/pr99663.c b/gcc/testsuite/gcc.target/s390/pr99663.c
new file mode 100644 (file)
index 0000000..f4f0f94
--- /dev/null
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-mtune=z15 -march=z13 -mzarch -O2 -fno-stack-protector -fPIC" } */
+
+typedef struct {
+  int exponent;
+  unsigned short lsu[];
+} decNumber;
+decNumber decDivideOp_lhs;
+short decDivideOp_varbuff;
+void decDivideOp(decNumber *rhs) {
+  short *msu1;
+  int exponent;
+  unsigned short *source;
+  for (; source >= decDivideOp_lhs.lsu; source--, msu1--)
+    *msu1 = *source;
+  for (;;)
+    if (exponent)
+      if (decDivideOp_varbuff)
+        exponent = rhs->exponent;
+}