aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDominik Vogt <vogt@linux.vnet.ibm.com>2016-12-19 09:53:56 +0000
committerAndreas Krebbel <krebbel@gcc.gnu.org>2016-12-19 09:53:56 +0000
commitad7ab32ed443d716f45ed315aa5349981954aa6c (patch)
treea4b329f398660e47d560b530217bffa6e84d055f /gcc
parente01f223f28d94ececee29b8048434361de5cd40c (diff)
downloadgcc-ad7ab32ed443d716f45ed315aa5349981954aa6c.zip
gcc-ad7ab32ed443d716f45ed315aa5349981954aa6c.tar.gz
gcc-ad7ab32ed443d716f45ed315aa5349981954aa6c.tar.bz2
PR target/78748: S/390: Fix ICE with ANDC splitter.
gcc/ChangeLog: 2016-12-19 Dominik Vogt <vogt@linux.vnet.ibm.com> PR target/78748 * config/s390/s390.md ("*andc_split_<mode>"): Allow memory destination only if it coincides with operand 2. gcc/testsuite/ChangeLog: 2016-12-19 Dominik Vogt <vogt@linux.vnet.ibm.com> PR target/78748 * gcc.c-torture/compile/pr78748.c: New test. From-SVN: r243793
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/s390/s390.md6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr78748.c14
4 files changed, 30 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3622483..8255e50 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2016-12-19 Dominik Vogt <vogt@linux.vnet.ibm.com>
+ PR target/78748
+ * config/s390/s390.md ("*andc_split_<mode>"): Allow memory destination
+ only if it coincides with operand 2.
+
+2016-12-19 Dominik Vogt <vogt@linux.vnet.ibm.com>
+
* combine.c (change_zero_ext): Skip generation of redundant AND.
2016-12-19 Krister Walfridsson <krister.walfridsson@gmail.com>
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 4f2effd..9d8e6b6 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -7420,7 +7420,11 @@
(and:GPR (not:GPR (match_operand:GPR 1 "nonimmediate_operand" ""))
(match_operand:GPR 2 "general_operand" "")))
(clobber (reg:CC CC_REGNUM))]
- "! reload_completed && s390_logical_operator_ok_p (operands)"
+ "! reload_completed
+ && (GET_CODE (operands[0]) != MEM
+ /* Ensure that s390_logical_operator_ok_p will succeed even
+ on the split xor if (b & a) is stored into a pseudo. */
+ || rtx_equal_p (operands[0], operands[2]))"
"#"
"&& 1"
[
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7b91b7b..53813b5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-19 Dominik Vogt <vogt@linux.vnet.ibm.com>
+
+ PR target/78748
+ * gcc.c-torture/compile/pr78748.c: New test.
+
2016-12-18 Janus Weil <janus@gcc.gnu.org>
PR fortran/78848
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr78748.c b/gcc/testsuite/gcc.c-torture/compile/pr78748.c
new file mode 100644
index 0000000..032e78d
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr78748.c
@@ -0,0 +1,14 @@
+/* PR target/78748 */
+/* { dg-options "-march=zEC12" { target { s390*-*-* } } } */
+
+void
+foo (int *p, int *q)
+{
+ *q = *p & ~*q;
+}
+
+void
+bar (int *p, int *q)
+{
+ *q = ~*p & *q;
+}