From 78a69f6248bf721ea5674bbdeecbe525699db9cd Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 15 Sep 2017 23:42:20 +0200 Subject: [PATCH] backport: re PR c++/81314 (Undefined reference to a function with -fopenmp) Backported from mainline 2017-09-14 Jakub Jelinek PR c++/81314 * cp-gimplify.c (omp_var_to_track): Look through references. (omp_cxx_notice_variable): Likewise. * testsuite/libgomp.c++/pr81314.C: New test. From-SVN: r252864 --- gcc/cp/ChangeLog | 9 ++++++ gcc/cp/cp-gimplify.c | 4 +++ libgomp/ChangeLog | 5 ++++ libgomp/testsuite/libgomp.c++/pr81314.C | 38 +++++++++++++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 libgomp/testsuite/libgomp.c++/pr81314.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4140997c61a6..807ed4604823 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2017-09-15 Jakub Jelinek + + Backported from mainline + 2017-09-14 Jakub Jelinek + + PR c++/81314 + * cp-gimplify.c (omp_var_to_track): Look through references. + (omp_cxx_notice_variable): Likewise. + 2017-08-14 Paolo Carlini PR c++/71570 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 23201d3cec5b..58037e56e6c4 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -853,6 +853,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)) @@ -905,6 +907,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 bba190c221e1..a8db5f768343 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,6 +1,11 @@ 2017-09-15 Jakub Jelinek Backported from mainline + 2017-09-14 Jakub Jelinek + + PR c++/81314 + * testsuite/libgomp.c++/pr81314.C: New test. + 2017-08-09 Jakub Jelinek PR c/81687 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 +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); + } +} -- 2.47.2