From: Andreas Krebbel Date: Fri, 19 Oct 2018 08:55:27 +0000 (+0000) Subject: S/390: Fix problem with vec_init expander X-Git-Tag: releases/gcc-7.4.0~89 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37a2c02ed522244face3b6c5a76cf878cce4fcbe;p=thirdparty%2Fgcc.git S/390: Fix problem with vec_init expander gcc/ChangeLog: 2018-10-19 Andreas Krebbel Backport from mainline 2018-10-15 Andreas Krebbel * config/s390/s390.c (s390_expand_vec_init): Force vector element into reg if it isn't a general operand. gcc/testsuite/ChangeLog: 2018-10-19 Andreas Krebbel Backport from mainline 2018-10-15 Andreas Krebbel * g++.dg/vec-init-1.C: New test. From-SVN: r265309 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 242c8278a66f..941159efb598 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-10-19 Andreas Krebbel + + Backport from mainline + 2018-10-15 Andreas Krebbel + + * config/s390/s390.c (s390_expand_vec_init): Force vector element + into reg if it isn't a general operand. + 2018-10-17 Eric Botcazou PR middle-end/87623 diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 603f5d6486ef..f6b7dfc2bbe0 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -6596,11 +6596,16 @@ s390_expand_vec_init (rtx target, rtx vals) return; } + /* Use vector replicate instructions. vlrep/vrepi/vrep */ if (all_same) { - emit_insn (gen_rtx_SET (target, - gen_rtx_VEC_DUPLICATE (mode, - XVECEXP (vals, 0, 0)))); + rtx elem = XVECEXP (vals, 0, 0); + + /* vec_splats accepts general_operand as source. */ + if (!general_operand (elem, GET_MODE (elem))) + elem = force_reg (inner_mode, elem); + + emit_insn (gen_rtx_SET (target, gen_rtx_VEC_DUPLICATE (mode, elem))); return; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 98bcaaaca26e..ba29eafdc1b9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-10-19 Andreas Krebbel + + Backport from mainline + 2018-10-15 Andreas Krebbel + + * g++.dg/vec-init-1.C: New test. + 2018-10-17 Eric Botcazou * gcc.c-torture/execute/pr87623.c: New test. diff --git a/gcc/testsuite/g++.dg/vec-init-1.C b/gcc/testsuite/g++.dg/vec-init-1.C new file mode 100644 index 000000000000..f35d39c35ed2 --- /dev/null +++ b/gcc/testsuite/g++.dg/vec-init-1.C @@ -0,0 +1,26 @@ +/* On S/390 this ends up calling the vec_init RTL expander with a + parallel of two symbol_refs. */ + +/* { dg-do compile } */ +/* { dg-options "-O3 -fPIC" } */ + + +struct test +{ + struct base + { + int key; + }; + struct derived : public base + { + int key; + }; + + derived core; + derived &dRef; + base &bRef; + + test() : dRef (core), bRef (core) {} +}; + +test test;