backport: re PR target/60693 (ICE on funny memcpy)

	Backport from mainline
	2014-03-28  Jakub Jelinek  <jakub@redhat.com>

	PR target/60693
	* config/i386/i386.c (ix86_copy_addr_to_reg): Call copy_addr_to_reg
	also if addr has VOIDmode.

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

From-SVN: r209268

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 49d08ad3b2a89aa9cfee40e15378d2372646dbc6..4c6daa9ce7e5c1d35d934ae584e7260795f094b9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2014-04-10  Jakub Jelinek  <jakub@redhat.com>
 
        Backport from mainline
+       2014-03-28  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/60693
+       * config/i386/i386.c (ix86_copy_addr_to_reg): Call copy_addr_to_reg
+       also if addr has VOIDmode.
+
        2014-03-17  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/60516

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index dbcbfd5819988bc0a48976e074375c940d1e745d..e3d45a69f4b1865d2aeda3f39d84b01af9a54179 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -21712,7 +21712,7 @@ counter_mode (rtx count_exp)
 static rtx
 ix86_copy_addr_to_reg (rtx addr)
 {
-  if (GET_MODE (addr) == Pmode)
+  if (GET_MODE (addr) == Pmode || GET_MODE (addr) == VOIDmode)
     return copy_addr_to_reg (addr);
   else
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dc3201cb8c16e083acd941544b21ba53d4372cbc..d94f2a51078969dc5667ac25e64f008f9bdae924 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
        Backport from mainline
        2014-03-28  Jakub Jelinek  <jakub@redhat.com>
 
+       PR target/60693
+       * gcc.target/i386/pr60693.c: New test.
+
        PR c++/60689
        * c-c++-common/pr60689.c: New test.
 

diff --git a/gcc/testsuite/gcc.target/i386/pr60693.c b/gcc/testsuite/gcc.target/i386/pr60693.c
new file mode 100644 (file)
index 0000000..e6033a7
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr60693.c
@@ -0,0 +1,13 @@
+/* PR target/60693 */
+/* { dg-do compile } */
+/* { dg-options "-O0" } */
+
+void bar (char *);
+
+void
+foo (void)
+{
+  char buf[4096];
+  __builtin_memcpy (buf, (void *) 0x8000, 4096);
+  bar (buf);
+}