diff mbox

[v2] PR target/78748: S/390: Fix ICE with ANDC splitter.

Message ID 20161212163703.GA10922@linux.vnet.ibm.com
State New
Headers show

Commit Message

Dominik Vogt Dec. 12, 2016, 4:37 p.m. UTC 
On Mon, Dec 12, 2016 at 03:50:14PM +0100, Jakub Jelinek wrote:
> On Mon, Dec 12, 2016 at 03:36:01PM +0100, Dominik Vogt wrote:
> > 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..d24a334
> > --- /dev/null
> > +++ b/gcc/testsuite/gcc.c-torture/compile/pr78748.c
> > @@ -0,0 +1,16 @@
> > +/* PR target/78748 */
> > +/* { dg-options "-march=zEC12" { target { s390*-*-* } } } */
> > +
> > +void
> > +foo (int *p, int *q)
> > +{
> > +  *q = *p & ~*q;
> > +}
> > +
> > +#if 0 /*!!!*/
> > +void
> > +bar (int *p, int *q)
> > +{
> > +  *q = ~*p & *q;
> > +}
> > +#endif
> 
> Why the #if 0 /*!!!*/?

The "!!!" is a to-do-marker.  When doing too many things in
parallel I sometimes forget removing them.  Sorry for that.  Patch
without the marker attached.

> The test just verifies the compiler doesn't ICE
> and stuff assembles,

> I'd hope bar also compiles and assembles.

It does, with and without the patch.

Ciao

Dominik ^_^  ^_^

Comments

Andreas Krebbel Dec. 19, 2016, 9:56 a.m. UTC | #1 
On Mon, Dec 12, 2016 at 05:37:03PM +0100, Dominik Vogt wrote:
> gcc/ChangeLog-pr78748
> 
> 	PR target/78748
> 	* config/s390/s390.md ("*andc_split_<mode>"): Allow memory destination
> 	only if it coincides with operand 2.
> gcc/testsuite/ChangeLog-pr78748
> 
> 	PR target/78748
> 	* gcc.c-torture/compile/pr78748.c: New test.

Applied.  Thanks!

-Andreas-
diff mbox

Patch

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/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;
+}