i386.c (ix86_expand_movmem): Fix epilogue generation.

gcc:
* config/i386/i386.c (ix86_expand_movmem): Fix epilogue generation.

gcc/testsuite:
* gcc.dg/torture/memcpy-1.c: New test.

From-SVN: r202423

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 56de596feaae1e9dbca1c8ea129a06840b199c7b..9f4a4b0efc341108f2e9582321b47d80e4d32963 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-10  Michael Zolotukhin  <michael.v.zolotukhin@gmail.com>
+
+       * config/i386/i386.c (ix86_expand_movmem): Fix epilogue generation.
+
 2013-09-10  Alan Modra  <amodra@gmail.com>
 
        PR target/58330

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e2fa71a369aa2997785b85532ff1461de6867e46..1f07e6f3282c424978fc2f8fff4b9adb284da16d 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -23329,7 +23329,7 @@ ix86_expand_movmem (rtx dst, rtx src, rtx count_exp, rtx align_exp,
 
   if (count_exp != const0_rtx && epilogue_size_needed > 1)
     expand_movmem_epilogue (dst, src, destreg, srcreg, count_exp,
-                           size_needed);
+                           epilogue_size_needed);
   if (jump_around_label)
     emit_label (jump_around_label);
   return true;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ecfd09142f7ac62f82f23834ee93fc810627756b..a10988796c0e93e66a252a9f0a96666c1aebda2f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-10  Michael Zolotukhin  <michael.v.zolotukhin@gmail.com>
+
+       * gcc.dg/torture/memcpy-1.c: New test.
+
 2013-09-10  Alan Modra  <amodra@gmail.com>
 
        * gcc.target/powerpc/pr58330.c: New.

diff --git a/gcc/testsuite/gcc.dg/torture/memcpy-1.c b/gcc/testsuite/gcc.dg/torture/memcpy-1.c
new file mode 100644 (file)
index 0000000..290c789
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/memcpy-1.c
@@ -0,0 +1,22 @@
+/* { dg-do run } */
+/* { dg-additional-options "-mtune=pentiumpro" { target ia32 } } */
+/* { dg-additional-options "-minline-all-stringops" { target { i?86-*-* x86_64-*-* } } } */
+
+static void __attribute__((noinline, noclone))
+my_memcpy (char *dest, const char *src, int n)
+{
+  __builtin_memcpy (dest, src, n);
+}
+
+int
+main (void)
+{
+  char a1[4], a2[4];
+  __builtin_memset (a1, 'a', 4);
+  __builtin_memset (a2, 'b', 4);
+  my_memcpy (a2, a1, 4);
+  if (a2[0] != 'a')
+    __builtin_abort ();
+  return 0;
+}
+