re PR middle-end/64421 (Incorrect vector function name generated for log)

	PR middle-end/64421
	* omp-low.c (simd_clone_mangle): If DECL_ASSEMBLER_NAME starts
	with asterisk, skip the first character.

	* gcc.dg/vect/pr64421.c: New test.

From-SVN: r220137

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb42a5af02f23fdf2bafe78fe2c11588069ae186..f10bfb729a97f95442211bf35c57057ebe53a304 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-26  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/64421
+       * omp-low.c (simd_clone_mangle): If DECL_ASSEMBLER_NAME starts
+       with asterisk, skip the first character.
+
 2015-01-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR target/64806

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index da53334b3252fac5516fb7065b1a8e73151047f2..182836b3a66c2392e1c414eccd1ddd427c3686ec 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -12663,9 +12663,11 @@ simd_clone_mangle (struct cgraph_node *node,
     }
 
   pp_underscore (&pp);
-  pp_string (&pp,
-            IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (node->decl)));
-  const char *str = pp_formatted_text (&pp);
+  const char *str = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (node->decl));
+  if (*str == '*')
+    ++str;
+  pp_string (&pp, str);
+  str = pp_formatted_text (&pp);
 
   /* If there already is a SIMD clone with the same mangled name, don't
      add another one.  This can happen e.g. for

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7fabc0396ade023aacc7804446d974bdf087da87..64162b05604836cca55c47448a28cf195822a061 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-26  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/64421
+       * gcc.dg/vect/pr64421.c: New test.
+
 2015-01-26  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/64771

diff --git a/gcc/testsuite/gcc.dg/vect/pr64421.c b/gcc/testsuite/gcc.dg/vect/pr64421.c
new file mode 100644 (file)
index 0000000..7e48a8b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/pr64421.c
@@ -0,0 +1,36 @@
+/* PR middle-end/64421 */
+/* { dg-require-effective-target vect_simd_clones } */
+/* { dg-additional-options "-fopenmp-simd" } */
+/* { dg-additional-options "-mavx" { target avx_runtime } } */
+
+#include "tree-vect.h"
+
+#pragma omp declare simd linear (y) notinbranch
+int foo (int x, int y) __asm ("bar");
+
+#pragma omp declare simd linear (y) notinbranch
+int
+foo (int x, int y)
+{
+  return x + y;
+}
+
+int a[1024] = { 1, 2 };
+
+int
+main ()
+{
+  int i;
+  check_vect ();
+  #pragma omp simd
+  for (i = 0; i < 1024; i++)
+    a[i] = foo (a[i], i);
+  if (a[0] != 1 || a[1] != 3)
+    abort ();
+  for (i = 2; i < 1024; i++)
+    if (a[i] != i)
+      abort ();
+  return 0;
+}
+
+/* { dg-final { cleanup-tree-dump "vect" } } */