Bootstrapped and regtested on s390x-redhat-linux.
The previous attempt to fix PR89233 [1] went into wrong direction of
dealing with symptoms rather than the root cause. Since the approach
here is completely different, I'm not sending it as v2.
The following insn:
(insn (set (reg:DI %r2)
(sign_extend:DI (mem:SI
(const:DI (plus:DI (symbol_ref:DI ("*.LC0"))
(const_int 16)))))))
is correctly recognized by LRA as RIL alternative of extendsidi2
define_insn. However, when recognition runs after LRA, it returns RXY
alternative, which is incorrect, since the offset 16 points past the
end of of *.LC0 literal pool entry. Such addresses are normally
rejected by s390_decompose_address ().
This inconsistency confuses annotate_constant_pool_refs: the selected
alternative makes it proceed with annotation, only to find that the
annotated address is invalid, causing ICE.
This patch fixes the root cause, namely, that s390_check_qrst_address ()
behaves differently during and after LRA.
[1] https://gcc.gnu.org/ml/gcc-patches/2019-02/msg00736.html
gcc/ChangeLog:
2019-02-11 Ilya Leoshkevich <i...@linux.ibm.com>
PR target/89233
* config/s390/s390.c (s390_decompose_address): Update comment.
(s390_check_qrst_address): Reject invalid address forms after
LRA.
gcc/testsuite/ChangeLog:
2019-02-11 Ilya Leoshkevich <i...@linux.ibm.com>
PR target/89233
* gcc.target/s390/pr89233.c: New test.
---
gcc/config/s390/s390.c | 10 +++++++---
gcc/testsuite/gcc.target/s390/pr89233.c | 11 +++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/gcc.target/s390/pr89233.c
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 6a571a3e054..713973a3fd4 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -3020,7 +3020,9 @@ s390_decompose_address (rtx addr, struct s390_address
*out)
if (offset)
{
/* If we have an offset, make sure it does not
- exceed the size of the constant pool entry. */
+ exceed the size of the constant pool entry.
+ Otherwise we might generate an out-of-range
+ displacement for the base register form. */
rtx sym = XVECEXP (disp, 0, 0);
if (offset >= GET_MODE_SIZE (get_pool_mode (sym)))
return false;
@@ -3193,8 +3195,10 @@ s390_check_qrst_address (char c, rtx op, bool
lit_pool_ok)
generic cases below ('R' or 'T'), since reload will in fact fix
them up. LRA behaves differently here; we never see such forms,
but on the other hand, we need to strictly reject every invalid
- address form. Perform this check right up front. */
- if (lra_in_progress)
+ address form. After both reload and LRA invalid address forms
+ must be rejected, because nothing will fix them up later. Perform
+ this check right up front. */
+ if (lra_in_progress || reload_completed)
{
if (!decomposed && !s390_decompose_address (op, &addr))
return 0;
diff --git a/gcc/testsuite/gcc.target/s390/pr89233.c
b/gcc/testsuite/gcc.target/s390/pr89233.c
new file mode 100644
index 00000000000..f572bfa08d8
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/pr89233.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-march=z13 -O1" } */
+
+typedef int v4si __attribute__ ((vector_size (16)));
+
+int
+f ()
+{
+ v4si x = {0, 1, 2, 3};
+ return x[4];
+}
--
2.20.1
