From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1461) id 4ACC33858D3C; Mon, 17 Jan 2022 15:56:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4ACC33858D3C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Stubbs To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6641] OpenMP: allow requires dynamic_allocators X-Act-Checkin: gcc X-Git-Author: Andrew Stubbs X-Git-Refname: refs/heads/master X-Git-Oldrev: 1374d4b963a6ac2e0ec1645c09e5162e68b009d6 X-Git-Newrev: 450c85b81f4dd67bf6211d307afdc0f3c07ef44f Message-Id: <20220117155633.4ACC33858D3C@sourceware.org> Date: Mon, 17 Jan 2022 15:56:33 +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: Mon, 17 Jan 2022 15:56:33 -0000 https://gcc.gnu.org/g:450c85b81f4dd67bf6211d307afdc0f3c07ef44f commit r12-6641-g450c85b81f4dd67bf6211d307afdc0f3c07ef44f Author: Andrew Stubbs Date: Thu Dec 16 15:30:05 2021 +0000 OpenMP: allow requires dynamic_allocators There's no need to reject the dynamic_allocators requires directive because we actually do support the feature, and it doesn't have to actually "do" anything. gcc/c/ChangeLog: * c-parser.c (c_parser_omp_requires): Don't "sorry" dynamic_allocators. gcc/cp/ChangeLog: * parser.c (cp_parser_omp_requires): Don't "sorry" dynamic_allocators. gcc/fortran/ChangeLog: * openmp.c (gfc_match_omp_requires): Don't "sorry" dynamic_allocators. gcc/testsuite/ChangeLog: * gfortran.dg/gomp/requires-8.f90: Reinstate dynamic allocators requirement. Diff: --- gcc/c/c-parser.c | 2 +- gcc/cp/parser.c | 2 +- gcc/fortran/openmp.c | 3 ++- gcc/testsuite/gfortran.dg/gomp/requires-8.f90 | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 6ada0048f5a..20774f75303 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -22583,7 +22583,7 @@ c_parser_omp_requires (c_parser *parser) c_parser_skip_to_pragma_eol (parser, false); return; } - if (p) + if (p && this_req != OMP_REQUIRES_DYNAMIC_ALLOCATORS) sorry_at (cloc, "%qs clause on % directive not " "supported yet", p); if (p) diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index c06ed5e4dbd..97e9aea6979 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -46512,7 +46512,7 @@ cp_parser_omp_requires (cp_parser *parser, cp_token *pragma_tok) cp_parser_skip_to_pragma_eol (parser, pragma_tok); return false; } - if (p) + if (p && this_req != OMP_REQUIRES_DYNAMIC_ALLOCATORS) sorry_at (cloc, "%qs clause on % directive not " "supported yet", p); if (p) diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index a204323f883..4a031975afc 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -5412,7 +5412,8 @@ gfc_match_omp_requires (void) else goto error; - if (requires_clause & ~OMP_REQ_ATOMIC_MEM_ORDER_MASK) + if (requires_clause & ~(OMP_REQ_ATOMIC_MEM_ORDER_MASK + | OMP_REQ_DYNAMIC_ALLOCATORS)) gfc_error_now ("Sorry, %qs clause at %L on REQUIRES directive is not " "yet supported", clause, &old_loc); if (!gfc_omp_requires_add_clause (requires_clause, clause, &old_loc, NULL)) diff --git a/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 b/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 index 3c32ae9860e..eadfcaf8609 100644 --- a/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 @@ -4,7 +4,7 @@ contains subroutine foo interface subroutine bar2 - !$!omp requires dynamic_allocators + !$omp requires dynamic_allocators end subroutine end interface !$omp target