re PR target/50725 (-O3 -mstackrealign -march=core2 generates invalid prologue code...

	PR target/50725
	* function.c (thread_prologue_and_epilogue_insns): If
	stack_realign_drap, add drap_reg to SET_UP_BY_PROLOGUE
	regset.

	* gcc.target/i386/pr50725.c: New test.

From-SVN: r181860

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a5262ab0531b11f2c794badab289c2e8c5e49f62..66093b15d5b86c6be294f18454c64d004301332b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-30  Jakub Jelinek  <jakub@redhat.com>
 
+       PR target/50725
+       * function.c (thread_prologue_and_epilogue_insns): If
+       stack_realign_drap, add drap_reg to SET_UP_BY_PROLOGUE
+       regset.
+
        PR middle-end/51089
        * tree-eh.c (cleanup_empty_eh_merge_phis): Add check to
        avoid creating duplicate edges here.

diff --git a/gcc/function.c b/gcc/function.c
index 6cf67c036d2ab5a3eb36f743f44f05cb05d39eb3..fa9236ce4b84d9d54ffeafbdd42deab37766471d 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -5893,6 +5893,9 @@ thread_prologue_and_epilogue_insns (void)
       if (pic_offset_table_rtx)
        add_to_hard_reg_set (&set_up_by_prologue, Pmode,
                             PIC_OFFSET_TABLE_REGNUM);
+      if (stack_realign_drap && crtl->drap_reg)
+       add_to_hard_reg_set (&set_up_by_prologue, GET_MODE (crtl->drap_reg),
+                            REGNO (crtl->drap_reg));
 
       /* We don't use a different max size depending on
         optimize_bb_for_speed_p because increasing shrink-wrapping

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1df8f77100cf4fe8035f8d176354aae7774b8f42..9e8ec39ceee390e4c64b99121c68fa40b68c1640 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-30  Jakub Jelinek  <jakub@redhat.com>
 
+       PR target/50725
+       * gcc.target/i386/pr50725.c: New test.
+
        PR middle-end/51089
        * gfortran.dg/gomp/pr51089.f90: New test.
 

diff --git a/gcc/testsuite/gcc.target/i386/pr50725.c b/gcc/testsuite/gcc.target/i386/pr50725.c
new file mode 100644 (file)
index 0000000..ef74ecb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr50725.c
@@ -0,0 +1,48 @@
+/* PR target/50725 */
+/* { dg-do run { target avx_runtime } } */
+/* { dg-options "-O2 -mavx" } */
+
+extern void abort (void);
+
+typedef int __attribute__((vector_size (32))) m256i;
+
+__attribute__((noinline, noclone)) void
+foo (int *x, m256i *y)
+{
+  asm volatile ("" : : "r" (x), "r" (y) : "memory");
+}
+
+__attribute__((noinline, noclone)) int
+bar (int x)
+{
+  if (x > 20)
+    return 24;
+  m256i i;
+  foo (__builtin_alloca (x), &i);
+  return 128;
+}
+
+__attribute__((noinline, noclone)) int
+baz (int d0, int d1, int d2, int d3, int d4, int d5, int x)
+{
+  if (x > 20)
+    return 24;
+  m256i i;
+  d0 += d1 + d2 + d3 + d4 + d5; d1 += d0;
+  foo (__builtin_alloca (x), &i);
+  return 128;
+}
+
+int
+main ()
+{
+  if (bar (22) != 24 || bar (20) != 128)
+    abort ();
+#ifdef __x86_64__
+  register long r10 __asm__ ("r10") = 0xdeadbeefdeadbeefUL;
+  asm volatile ("" : "+r" (r10));
+#endif
+  if (baz (0, 0, 0, 0, 0, 0, 22) != 24 || baz (0, 0, 0, 0, 0, 0, 20) != 128)
+    abort ();
+  return 0;
+}