aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2017-09-14 22:18:17 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2017-09-14 22:18:17 +0200
commit8b5865104c57edfc56c5a10bcbcdbaf8b527658f (patch)
tree3d7d0e0c7d54b8b34774a1e25e74a48dc3f235e1
parent595ced60609a353b91face2f87b6f7abe3eaf28c (diff)
downloadgcc-8b5865104c57edfc56c5a10bcbcdbaf8b527658f.zip
gcc-8b5865104c57edfc56c5a10bcbcdbaf8b527658f.tar.gz
gcc-8b5865104c57edfc56c5a10bcbcdbaf8b527658f.tar.bz2
re PR c++/81314 (Undefined reference to a function with -fopenmp)
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: r252770
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/cp-gimplify.c4
-rw-r--r--libgomp/ChangeLog5
-rw-r--r--libgomp/testsuite/libgomp.c++/pr81314.C38
4 files changed, 53 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c0b7ba2..1bda581 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+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-13 Nathan Sidwell <nathan@acm.org>
Conv-op identifers not in identifier hash table
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 4a52aa5..262485a 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -895,6 +895,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))
@@ -947,6 +949,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 8e50b80..459dcff 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-14 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/81314
+ * testsuite/libgomp.c++/pr81314.C: New test.
+
2017-09-03 Gerald Pfeifer <gerald@pfeifer.com>
* libgomp.texi (Top): www.openacc.org now uses https.
diff --git a/libgomp/testsuite/libgomp.c++/pr81314.C b/libgomp/testsuite/libgomp.c++/pr81314.C
new file mode 100644
index 0000000..afe8943
--- /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);
+ }
+}