From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 26E23385841A; Mon, 16 Jan 2023 11:37:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26E23385841A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673869077; bh=c5tDOIMs2/V5JpsCD6MYzBr/WHnnjGwk7E6loL2nr0U=; h=From:To:Subject:Date:From; b=qLJav7MdGTgz4SJ9QImNohk2PSdIxDyOqd1qD8yXoiA6W/TaBy0up3bcck0L8cG1I 1xXHJ2DeFQOKQuR++FcI+8HirIHENTyPmIICmfXLQBi1NvaR1K77rc1Q+TN5kQy8xS KZcH6xF01a6ybjp3HkubgH2ryiG7anvw1HsWThlo= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] Fortran/OpenMP: Reject non-scalar 'holds' expr in 'omp assume(s)' [PR107706] X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: d7995cf373a1605a48462b97fceb751a42554cd7 X-Git-Newrev: 01a12b3d7662722f8fc67e454bd919073ee31868 Message-Id: <20230116113757.26E23385841A@sourceware.org> Date: Mon, 16 Jan 2023 11:37:57 +0000 (GMT) List-Id: https://gcc.gnu.org/g:01a12b3d7662722f8fc67e454bd919073ee31868 commit 01a12b3d7662722f8fc67e454bd919073ee31868 Author: Tobias Burnus Date: Mon Jan 16 12:37:41 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. (cherry picked from commit 2ce55247a8bf32985a96ed63a7a92d36746723dc) Diff: --- gcc/fortran/ChangeLog.omp | 8 ++++++++ gcc/fortran/openmp.cc | 8 +++++--- gcc/testsuite/ChangeLog.omp | 10 ++++++++++ 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 +- 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index 6fef25a3a01..4450c067d87 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,3 +1,11 @@ +2023-01-16 Tobias Burnus + + Backported from master: + 2023-01-12 Tobias Burnus + + PR fortran/107706 + * openmp.cc (gfc_resolve_omp_assumptions): Reject nonscalars. + 2022-12-21 Tobias Burnus Backported from master: diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index 06944f392c3..7679dbef088 100644 --- a/gcc/fortran/openmp.cc +++ b/gcc/fortran/openmp.cc @@ -7701,9 +7701,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/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index ae810eb4ead..d4b483b124b 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,13 @@ +2023-01-16 Tobias Burnus + + Backported from master: + 2023-01-12 Tobias Burnus + + 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. + 2023-01-09 Tobias Burnus Backport from mainline: 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