re PR rtl-optimization/71532 (FAIL: gfortran.dg/select_char_1.f90 -O2 execution...

	PR rtl-optimization/71532
	* cse.c (cse_insn): For const/pure calls, invalidate argument passing
	memory slots.

	* gcc.dg/torture/pr71532.c: New test.

From-SVN: r237503

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2650405a3f786f41b7453c17e1c2be5d83f1efc8..0ffb38c3a1dd0325d7561d7006bfcdd9608b1c92 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-16  Jakub Jelinek  <jakub@redhat.com>
+
+       PR rtl-optimization/71532
+       * cse.c (cse_insn): For const/pure calls, invalidate argument passing
+       memory slots.
+
 2016-06-15  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        * config/rs6000/vsx.md (VSINT_84): Add DImode to enable loading

diff --git a/gcc/cse.c b/gcc/cse.c
index bce4fb0262e602bc14f8ad77e52224ed30872f98..3b4cc96ce058d431e7b078282138049dc19e4808 100644 (file)
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -5751,6 +5751,13 @@ cse_insn (rtx_insn *insn)
     {
       if (!(RTL_CONST_OR_PURE_CALL_P (insn)))
        invalidate_memory ();
+      else
+       /* For const/pure calls, invalidate any argument slots, because
+          those are owned by the callee.  */
+       for (tem = CALL_INSN_FUNCTION_USAGE (insn); tem; tem = XEXP (tem, 1))
+         if (GET_CODE (XEXP (tem, 0)) == USE
+             && MEM_P (XEXP (XEXP (tem, 0), 0)))
+           invalidate (XEXP (XEXP (tem, 0), 0), VOIDmode);
       invalidate_for_call ();
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index be12713dd9b964a35279bf4d1ec5e74ee82232b4..7362ecc111cdfc3f46e5e03ac926fddba67e698a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-16  Jakub Jelinek  <jakub@redhat.com>
+
+       PR rtl-optimization/71532
+       * gcc.dg/torture/pr71532.c: New test.
+
 2016-06-15  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        * gcc.target/powerpc/p9-dimode1.c: New test.

diff --git a/gcc/testsuite/gcc.dg/torture/pr71532.c b/gcc/testsuite/gcc.dg/torture/pr71532.c
new file mode 100644 (file)
index 0000000..b10414f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr71532.c
@@ -0,0 +1,39 @@
+/* PR rtl-optimization/71532 */
+/* { dg-do run } */
+/* { dg-additional-options "-mtune=slm" { target i?86-*-* x86_64-*-* } } */
+
+__attribute__((noinline, noclone, pure)) int
+foo (int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l)
+{
+  a++; b++; c++; d++; e++; f++; g++; h++; i++; j++; k++; l++;
+  asm volatile ("" : : "g" (&a), "g" (&b), "g" (&c), "g" (&d) : "memory");
+  asm volatile ("" : : "g" (&e), "g" (&f), "g" (&g), "g" (&h) : "memory");
+  asm volatile ("" : : "g" (&i), "g" (&j), "g" (&k), "g" (&l) : "memory");
+  return a + b + c + d + e + f + g + h + i + j + k + l;
+}
+
+__attribute__((noinline, noclone, pure)) int
+bar (int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l)
+{
+  a++; b++; c++; d++; e++; f++; g++; h++; i++; j++; k++; l++;
+  asm volatile ("" : : "g" (&a), "g" (&b), "g" (&c), "g" (&d) : "memory");
+  asm volatile ("" : : "g" (&e), "g" (&f), "g" (&g), "g" (&h) : "memory");
+  asm volatile ("" : : "g" (&i), "g" (&j), "g" (&k), "g" (&l) : "memory");
+  return 2 * a + b + c + d + e + f + g + h + i + j + k + l;
+}
+
+__attribute__((noinline, noclone)) int
+test ()
+{
+  int a = foo (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+  a += bar (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+  return a;
+}
+
+int
+main ()
+{
+  if (test () != 182)
+    __builtin_abort ();
+  return 0;
+}