From c1fb6ff897d0b929807d52cf52d4894e252e7d96 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 7 Sep 2022 08:54:13 +0200 Subject: [PATCH] openmp: Fix handling of target constructs in static member functions [PR106829] Just calling current_nonlambda_class_type in static member functions returns non-NULL, but something that isn't *this and if unlucky can match part of the IL and can be added to target clauses. if (DECL_NONSTATIC_MEMBER_P (decl) && current_class_ptr) is a guard used elsewhere (in check_accessibility_of_qualified_id). 2022-09-07 Jakub Jelinek PR c++/106829 * semantics.cc (finish_omp_target_clauses): If current_function_decl isn't a nonstatic member function, don't set data.current_object to non-NULL. * g++.dg/gomp/pr106829.C: New test. (cherry picked from commit e90af965e5c858ba02c0cdfbac35d0a19da1c2f6) --- gcc/cp/ChangeLog.omp | 10 ++++++++++ gcc/cp/semantics.cc | 17 ++++++++--------- gcc/testsuite/ChangeLog.omp | 8 ++++++++ gcc/testsuite/g++.dg/gomp/pr106829.C | 15 +++++++++++++++ 4 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/g++.dg/gomp/pr106829.C diff --git gcc/cp/ChangeLog.omp gcc/cp/ChangeLog.omp index 35504f4c92b..c3214f31252 100644 --- gcc/cp/ChangeLog.omp +++ gcc/cp/ChangeLog.omp @@ -1,3 +1,13 @@ +2022-09-09 Paul-Antoine Arras + + Backport from mainline: + 2022-09-07 Jakub Jelinek + + PR c++/106829 + * semantics.cc (finish_omp_target_clauses): If current_function_decl + isn't a nonstatic member function, don't set data.current_object to + non-NULL. + 2022-09-07 Tobias Burnus Backport from mainline: diff --git gcc/cp/semantics.cc gcc/cp/semantics.cc index 7717a820f0d..dad04dc4757 100644 --- gcc/cp/semantics.cc +++ gcc/cp/semantics.cc @@ -9727,16 +9727,15 @@ finish_omp_target_clauses (location_t loc, tree body, tree *clauses_ptr) { omp_target_walk_data data; data.this_expr_accessed = false; + data.current_object = NULL_TREE; - tree ct = current_nonlambda_class_type (); - if (ct) - { - tree object = maybe_dummy_object (ct, NULL); - object = maybe_resolve_dummy (object, true); - data.current_object = object; - } - else - data.current_object = NULL_TREE; + if (DECL_NONSTATIC_MEMBER_P (current_function_decl) && current_class_ptr) + if (tree ct = current_nonlambda_class_type ()) + { + tree object = maybe_dummy_object (ct, NULL); + object = maybe_resolve_dummy (object, true); + data.current_object = object; + } if (DECL_LAMBDA_FUNCTION_P (current_function_decl)) { diff --git gcc/testsuite/ChangeLog.omp gcc/testsuite/ChangeLog.omp index ed42b20b099..9ca4d936ff5 100644 --- gcc/testsuite/ChangeLog.omp +++ gcc/testsuite/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-09-09 Paul-Antoine Arras + + Backport from mainline: + 2022-09-07 Jakub Jelinek + + PR c++/106829 + * g++.dg/gomp/pr106829.C: New test. + 2022-09-07 Tobias Burnus Backport from mainline: diff --git gcc/testsuite/g++.dg/gomp/pr106829.C gcc/testsuite/g++.dg/gomp/pr106829.C new file mode 100644 index 00000000000..0295efb88ee --- /dev/null +++ gcc/testsuite/g++.dg/gomp/pr106829.C @@ -0,0 +1,15 @@ +// PR c++/106829 + +namespace std +{ + template class complex; + template <> struct complex { complex (double); _Complex double d; }; +} +struct S { void static foo (); }; + +void +S::foo () +{ +#pragma omp target + std::complex c = 0.0; +} -- 2.31.1