public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5006] openmp: Fix up finish_omp_target_clauses [PR108286] Date: Thu, 5 Jan 2023 11:01:05 +0000 (GMT) [thread overview] Message-ID: <20230105110105.872C23858D28@sourceware.org> (raw) https://gcc.gnu.org/g:29c3218618ef6177dc33871b26c8fbd9b21eabe1 commit r13-5006-g29c3218618ef6177dc33871b26c8fbd9b21eabe1 Author: Jakub Jelinek <jakub@redhat.com> Date: Thu Jan 5 11:57:30 2023 +0100 openmp: Fix up finish_omp_target_clauses [PR108286] The comment in the loop says that we shouldn't add a map clause if such a clause exists already, but the loop was actually using OMP_CLAUSE_DECL on any clause. Target construct can have various clauses which don't have OMP_CLAUSE_DECL at all (e.g. nowait, device or if) or clause where it means something different (e.g. privatization clauses, allocate, depend). So, only check OMP_CLAUSE_DECL on OMP_CLAUSE_MAP clauses. 2023-01-05 Jakub Jelinek <jakub@redhat.com> PR c++/108286 * semantics.cc (finish_omp_target_clauses): Ignore clauses other than OMP_CLAUSE_MAP. * testsuite/libgomp.c++/pr108286.C: New test. Diff: --- gcc/cp/semantics.cc | 4 +++- libgomp/testsuite/libgomp.c++/pr108286.C | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index ab52e56d6c1..ef5bf2430b1 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -9825,7 +9825,9 @@ finish_omp_target_clauses (location_t loc, tree body, tree *clauses_ptr) for (tree c = *clauses_ptr; c; c = OMP_CLAUSE_CHAIN (c)) { - /* If map(this->ptr[:N] already exists, avoid creating another + if (OMP_CLAUSE_CODE (c) != OMP_CLAUSE_MAP) + continue; + /* If map(this->ptr[:N]) already exists, avoid creating another such map. */ tree decl = OMP_CLAUSE_DECL (c); if ((TREE_CODE (decl) == INDIRECT_REF diff --git a/libgomp/testsuite/libgomp.c++/pr108286.C b/libgomp/testsuite/libgomp.c++/pr108286.C new file mode 100644 index 00000000000..ee88c2f9fd0 --- /dev/null +++ b/libgomp/testsuite/libgomp.c++/pr108286.C @@ -0,0 +1,29 @@ +// PR c++/108286 +// { dg-do run } + +struct S { + int + foo () + { + int res = 0; +#pragma omp target map(size, ptr[:size], res) nowait + res = ptr[size - 1]; +#pragma omp taskwait + return res; + } + + unsigned size; + int *ptr; +}; + +int +main () +{ + S s; + int buf[5]; + s.size = 5; + s.ptr = buf; + buf[4] = 42; + if (s.foo () != 42) + __builtin_abort (); +}
reply other threads:[~2023-01-05 11:01 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230105110105.872C23858D28@sourceware.org \ --to=jakub@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).