diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 4 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 8 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/pr81314.C | 38 |
4 files changed, 59 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4c1518995e0f..e86a37f3526e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2017-09-15 Jakub Jelinek <jakub@redhat.com> + + Backported from mainline + 2017-09-14 Jakub Jelinek <jakub@redhat.com> + + PR c++/81314 + * cp-gimplify.c (omp_var_to_track): Look through references. + (omp_cxx_notice_variable): Likewise. + 2017-09-09 Eric Botcazou <ebotcazou@adacore.com> PR bootstrap/81926 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index eae2a55a029f..7e7f3a2d1018 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -924,6 +924,8 @@ omp_var_to_track (tree decl) tree type = TREE_TYPE (decl); if (is_invisiref_parm (decl)) type = TREE_TYPE (type); + else if (TREE_CODE (type) == REFERENCE_TYPE) + type = TREE_TYPE (type); while (TREE_CODE (type) == ARRAY_TYPE) type = TREE_TYPE (type); if (type == error_mark_node || !CLASS_TYPE_P (type)) @@ -976,6 +978,8 @@ omp_cxx_notice_variable (struct cp_genericize_omp_taskreg *omp_ctx, tree decl) tree type = TREE_TYPE (decl); if (is_invisiref_parm (decl)) type = TREE_TYPE (type); + else if (TREE_CODE (type) == REFERENCE_TYPE) + type = TREE_TYPE (type); while (TREE_CODE (type) == ARRAY_TYPE) type = TREE_TYPE (type); get_copy_ctor (type, tf_none); diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 93bfedf43c07..59a2ff88b0ed 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2017-09-15 Jakub Jelinek <jakub@redhat.com> + + Backported from mainline + 2017-09-14 Jakub Jelinek <jakub@redhat.com> + + PR c++/81314 + * testsuite/libgomp.c++/pr81314.C: New test. + 2017-09-07 Jakub Jelinek <jakub@redhat.com> Backported from mainline diff --git a/libgomp/testsuite/libgomp.c++/pr81314.C b/libgomp/testsuite/libgomp.c++/pr81314.C new file mode 100644 index 000000000000..afe89438bd3f --- /dev/null +++ b/libgomp/testsuite/libgomp.c++/pr81314.C @@ -0,0 +1,38 @@ +// PR c++/81314 +// { dg-do link } + +template <int N> +struct S { + S () { s = 0; } + S (const S &x) { s = x.s; } + ~S () {} + int s; +}; + +void +foo (S<2> &x) +{ + #pragma omp taskloop + for (int i = 0; i < 100; ++i) + x.s++; +} + +void +bar (S<3> &x) +{ + #pragma omp task + x.s++; +} + +int +main () +{ + S<2> s; + S<3> t; + #pragma omp parallel + #pragma omp master + { + foo (s); + bar (t); + } +} |