From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id BC69D3858425; Wed, 21 Dec 2022 08:10:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC69D3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671610210; bh=ulH2mBGcbqbk+VGYBsdPbBaERH9+EX6iRT6iihXHTCw=; h=From:To:Subject:Date:From; b=yqeQetlNZP3AV+gc6eEIwZ52Lc85HvL1yPZkiuu86rpXJtA3Sr7DrinIl2aAw4Wyp FNU/6own9mhHOwPZKTYqFbfKqwgYzIZQwWDWxDxVQ7nHAW/uO2SSy/nZCdVbZLNT6H srod43daBxOsH14FQrw6RvfO+btm4IAEXE4STATo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4822] openmp: Don't try to destruct DECL_OMP_PRIVATIZED_MEMBER vars [PR108180] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 0d1b5446bf17c14fce3428a005446539292fe27e X-Git-Newrev: 1119902b6c7c1c50123ed85ec1def8be4772d68c Message-Id: <20221221081010.BC69D3858425@sourceware.org> Date: Wed, 21 Dec 2022 08:10:10 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1119902b6c7c1c50123ed85ec1def8be4772d68c commit r13-4822-g1119902b6c7c1c50123ed85ec1def8be4772d68c Author: Jakub Jelinek Date: Wed Dec 21 09:05:27 2022 +0100 openmp: Don't try to destruct DECL_OMP_PRIVATIZED_MEMBER vars [PR108180] DECL_OMP_PRIVATIZED_MEMBER vars are artificial vars with DECL_VALUE_EXPR of this->field used just during gimplification and omp lowering/expansion to privatize individual fields in methods when needed. As the following testcase shows, when not in templates, they were handled right, but in templates we actually called cp_finish_decl on them and that can result in their destruction, which is obviously undesirable, we should only destruct the privatized copies of them created in omp lowering. Fixed thusly. 2022-12-21 Jakub Jelinek PR c++/108180 * pt.cc (tsubst_expr): Don't call cp_finish_decl on DECL_OMP_PRIVATIZED_MEMBER vars. * testsuite/libgomp.c++/pr108180.C: New test. Diff: --- gcc/cp/pt.cc | 5 +++ libgomp/testsuite/libgomp.c++/pr108180.C | 55 ++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 2d902988a43..e68c74913f5 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -18873,6 +18873,11 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) tree asmspec_tree = NULL_TREE; maybe_push_decl (decl); + if (VAR_P (decl) + && DECL_LANG_SPECIFIC (decl) + && DECL_OMP_PRIVATIZED_MEMBER (decl)) + break; + if (VAR_P (decl) && DECL_DECOMPOSITION_P (decl) && TREE_TYPE (pattern_decl) != error_mark_node) diff --git a/libgomp/testsuite/libgomp.c++/pr108180.C b/libgomp/testsuite/libgomp.c++/pr108180.C new file mode 100644 index 00000000000..452910cebeb --- /dev/null +++ b/libgomp/testsuite/libgomp.c++/pr108180.C @@ -0,0 +1,55 @@ +// PR c++/108180 +// { dg-do run } + +struct A { + A () { ++a; } + A (A &&) = delete; + A (const A &) { ++a; } + A &operator= (const A &) = delete; + A &operator= (A &&) = delete; + ~A () { --a; } + static int a; +}; +int A::a = 0; + +struct B { + A a; + template + int + foo () + { + int res = 0; + #pragma omp parallel for if(false) firstprivate(a) + for (int i = 0; i < 64; ++i) + res += i; + return res; + } + int + bar () + { + int res = 0; + #pragma omp parallel for if(false) firstprivate(a) + for (int i = 0; i < 64; ++i) + res += i; + return res; + } +}; + +int +main () +{ + { + B b; + if (b.foo<0> () != 2016) + __builtin_abort (); + } + if (A::a != 0) + __builtin_abort (); + { + B b; + if (b.bar () != 2016) + __builtin_abort (); + } + if (A::a != 0) + __builtin_abort (); +}