aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2016-01-07 08:45:54 +0000
committerJakub Jelinek <jakub@redhat.com>2016-01-07 08:45:54 +0000
commita6f0bcbd485384d023c40aa779d3573c966c3195 (patch)
tree254f4d82e10f3f162b44144b402ba06abc6794b0
parent19620b79a6d19c2f6749ae9adad318aa2899cfa2 (diff)
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. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@232122 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/gimple-expr.c5
-rw-r--r--libgomp/ChangeLog5
-rw-r--r--libgomp/testsuite/libgomp.c/pr68960.c25
4 files changed, 41 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 832416eedf4..b690c97fc25 100644
--- 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 97b118e297e..15bef7f1665 100644
--- 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 8dd577c21f3..ebb2351456d 100644
--- 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
index 00000000000..2accc6af4a8
--- /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;
+}