re PR c/68960 (__attribute__ ((aligned ())) is ignored for OpenMP private variables)

	PR middle-end/68960
	* gimple-expr.c (copy_var_decl): If var has DECL_USER_ALIGN set, copy
	it and DECL_ALIGN too.

	* testsuite/libgomp.c/pr68960.c: New test.

From-SVN: r232122

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 832416eedf4f7ee74a7a4da013abb2a6e074cd23..b690c97fc25dd2676037c6a5c3250368def1a015 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-07  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/68960
+       * gimple-expr.c (copy_var_decl): If var has DECL_USER_ALIGN set, copy
+       it and DECL_ALIGN too.
+
 2016-01-06  Robert Suchanek  <robert.suchanek@imgtec.com>
 
        * config/mips/mips-ftypes.def: Sort to lexicographical order.

diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
index 97b118e297e0f42247f83fbc26e12494bd4318ce..15bef7f1665c20dfc29d46565dd972a11feaa270 100644 (file)
--- a/gcc/gimple-expr.c
+++ b/gcc/gimple-expr.c
@@ -375,6 +375,11 @@ copy_var_decl (tree var, tree name, tree type)
   TREE_USED (copy) = 1;
   DECL_SEEN_IN_BIND_EXPR_P (copy) = 1;
   DECL_ATTRIBUTES (copy) = DECL_ATTRIBUTES (var);
+  if (DECL_USER_ALIGN (var))
+    {
+      DECL_ALIGN (copy) = DECL_ALIGN (var);
+      DECL_USER_ALIGN (copy) = 1;
+    }
 
   return copy;
 }

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 8dd577c21f3d33bb1aef2f88228d26c93daa8a64..ebb2351456d91338f05db99c68ba4786ad896b91 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-07  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/68960
+       * testsuite/libgomp.c/pr68960.c: New test.
+
 2016-01-06  Nathan Sidwell  <nathan@acm.org>
 
        * openacc.h (acc_on_device): Add routine pragma for C++ wrapper.

diff --git a/libgomp/testsuite/libgomp.c/pr68960.c b/libgomp/testsuite/libgomp.c/pr68960.c
new file mode 100644 (file)
index 0000000..2accc6a
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr68960.c
@@ -0,0 +1,25 @@
+/* PR middle-end/68960 */
+/* { dg-do run } */
+
+int
+main ()
+{
+  int temp[257] __attribute__ ((aligned (256))) = { 0 };
+  #pragma omp parallel private (temp) num_threads (2)
+  {
+    int *p = &temp[0];
+    asm volatile ("" : "+g" (p));
+    if (((__UINTPTR_TYPE__) p) & 255)
+      __builtin_abort ();
+  }
+  #pragma omp parallel num_threads (2)
+  #pragma omp single
+  #pragma omp task firstprivate (temp)
+  {
+    int *p = &temp[0];
+    asm volatile ("" : "+g" (p));
+    if (((__UINTPTR_TYPE__) p) & 255)
+      __builtin_abort ();
+  }
+  return 0;
+}