From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id E5A283858403; Wed, 30 Mar 2022 07:41:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E5A283858403 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 r12-7915] openmp: Ensure DECL_CONTEXT of OpenMP iterators in templates [PR105092] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 9778a7dc0b3000813a1d25669bf2735f38219650 X-Git-Newrev: 410f39f56c14b195f066b9a18a3c6e8ffa03f848 Message-Id: <20220330074154.E5A283858403@sourceware.org> Date: Wed, 30 Mar 2022 07:41:54 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2022 07:41:55 -0000 https://gcc.gnu.org/g:410f39f56c14b195f066b9a18a3c6e8ffa03f848 commit r12-7915-g410f39f56c14b195f066b9a18a3c6e8ffa03f848 Author: Jakub Jelinek Date: Wed Mar 30 09:38:51 2022 +0200 openmp: Ensure DECL_CONTEXT of OpenMP iterators in templates [PR105092] cp_parser_omp_iterators does: DECL_ARTIFICIAL (iter_var) = 1; DECL_CONTEXT (iter_var) = current_function_decl; pushdecl (iter_var); on the newly created iterator vars, but when we instantiate templates containing them, we just tsubst_decl them (which apparently for automatic vars clears DECL_CONTEXT with a comment that pushdecl should be called on them later). The result is that we have automatic vars in the IL which have NULL DECL_CONTEXT and the analyzer is upset about those. Fixed by setting DECL_CONTEXT and calling pushdecl during the instantiation. 2022-03-30 Jakub Jelinek PR c++/105092 * pt.cc (tsubst_omp_clause_decl): When handling iterators, set DECL_CONTEXT of the iterator var to current_function_decl and call pushdecl. * g++.dg/gomp/pr105092.C: New test. Diff: --- gcc/cp/pt.cc | 2 ++ gcc/testsuite/g++.dg/gomp/pr105092.C | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index ece839c22e3..bdba5cf3b85 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -17575,6 +17575,8 @@ tsubst_omp_clause_decl (tree decl, tree args, tsubst_flags_t complain, *tp = copy_node (it); TREE_VEC_ELT (*tp, 0) = tsubst_decl (TREE_VEC_ELT (it, 0), args, complain); + DECL_CONTEXT (TREE_VEC_ELT (*tp, 0)) = current_function_decl; + pushdecl (TREE_VEC_ELT (*tp, 0)); TREE_VEC_ELT (*tp, 1) = tsubst_expr (TREE_VEC_ELT (it, 1), args, complain, in_decl, /*integral_constant_expression_p=*/false); diff --git a/gcc/testsuite/g++.dg/gomp/pr105092.C b/gcc/testsuite/g++.dg/gomp/pr105092.C new file mode 100644 index 00000000000..5f4e38aae40 --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr105092.C @@ -0,0 +1,26 @@ +// PR c++/105092 +// { dg-do compile { target analyzer } } +// { dg-options "-fanalyzer -fopenmp" } + +struct S { S () {} }; + +template +struct U { + T c[10]; + U () { +#pragma omp task affinity (iterator (i = 0 : 10 : 1): c[i]) + ; + } +}; + +template +struct V { + T c[10]; + V () { +#pragma omp task depend (iterator (i = 0 : 10 : 1), inout: c[i]) + ; + } +}; + +U u; +V v;