public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Tobias Burnus <burnus@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5118] Fortran/OpenMP: Reject non-scalar 'holds' expr in 'omp assume(s)' [PR107706] Date: Thu, 12 Jan 2023 10:44:40 +0000 (GMT) [thread overview] Message-ID: <20230112104440.CA6B63858D35@sourceware.org> (raw) https://gcc.gnu.org/g:2ce55247a8bf32985a96ed63a7a92d36746723dc commit r13-5118-g2ce55247a8bf32985a96ed63a7a92d36746723dc Author: Tobias Burnus <tobias@codesourcery.com> Date: Thu Jan 12 11:43:37 2023 +0100 Fortran/OpenMP: Reject non-scalar 'holds' expr in 'omp assume(s)' [PR107706] gcc/fortran/ChangeLog: PR fortran/107706 * openmp.cc (gfc_resolve_omp_assumptions): Reject nonscalars. gcc/testsuite/ChangeLog: PR fortran/107706 * gfortran.dg/gomp/assume-2.f90: Update dg-error. * gfortran.dg/gomp/assumes-2.f90: Likewise. * gfortran.dg/gomp/assume-5.f90: New test. Diff: --- gcc/fortran/openmp.cc | 8 +++++--- gcc/testsuite/gfortran.dg/gomp/assume-2.f90 | 2 +- gcc/testsuite/gfortran.dg/gomp/assume-5.f90 | 20 ++++++++++++++++++++ gcc/testsuite/gfortran.dg/gomp/assumes-2.f90 | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index b71ee467c01..916daeb1aa5 100644 --- a/gcc/fortran/openmp.cc +++ b/gcc/fortran/openmp.cc @@ -6911,9 +6911,11 @@ void gfc_resolve_omp_assumptions (gfc_omp_assumptions *assume) { for (gfc_expr_list *el = assume->holds; el; el = el->next) - if (!gfc_resolve_expr (el->expr) || el->expr->ts.type != BT_LOGICAL) - gfc_error ("HOLDS expression at %L must be a logical expression", - &el->expr->where); + if (!gfc_resolve_expr (el->expr) + || el->expr->ts.type != BT_LOGICAL + || el->expr->rank != 0) + gfc_error ("HOLDS expression at %L must be a scalar logical expression", + &el->expr->where); } diff --git a/gcc/testsuite/gfortran.dg/gomp/assume-2.f90 b/gcc/testsuite/gfortran.dg/gomp/assume-2.f90 index ca3e04dfe95..dc306a9088a 100644 --- a/gcc/testsuite/gfortran.dg/gomp/assume-2.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/assume-2.f90 @@ -22,6 +22,6 @@ subroutine foo (i, a) end if ! !$omp end assume - silence: 'Unexpected !$OMP END ASSUME statement' - !$omp assume holds (1.0) ! { dg-error "HOLDS expression at .1. must be a logical expression" } + !$omp assume holds (1.0) ! { dg-error "HOLDS expression at .1. must be a scalar logical expression" } !$omp end assume end diff --git a/gcc/testsuite/gfortran.dg/gomp/assume-5.f90 b/gcc/testsuite/gfortran.dg/gomp/assume-5.f90 new file mode 100644 index 00000000000..a922f89a708 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/assume-5.f90 @@ -0,0 +1,20 @@ +! PR fortran/107706 +! +! Contributed by G. Steinmetz +! + +integer function f(i) + implicit none + !$omp assumes holds(i < g()) ! { dg-error "HOLDS expression at .1. must be a scalar logical expression" } + integer, value :: i + + !$omp assume holds(i < g()) ! { dg-error "HOLDS expression at .1. must be a scalar logical expression" } + block + end block + f = 3 +contains + function g() + integer :: g(2) + g = 4 + end +end diff --git a/gcc/testsuite/gfortran.dg/gomp/assumes-2.f90 b/gcc/testsuite/gfortran.dg/gomp/assumes-2.f90 index 729c9737a1c..c8719a86a94 100644 --- a/gcc/testsuite/gfortran.dg/gomp/assumes-2.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/assumes-2.f90 @@ -4,7 +4,7 @@ module m !$omp assumes contains(target) holds(x > 0.0) !$omp assumes absent(target) !$omp assumes holds(0.0) -! { dg-error "HOLDS expression at .1. must be a logical expression" "" { target *-*-* } .-1 } +! { dg-error "HOLDS expression at .1. must be a scalar logical expression" "" { target *-*-* } .-1 } end module module m2
reply other threads:[~2023-01-12 10:44 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=20230112104440.CA6B63858D35@sourceware.org \ --to=burnus@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).