From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 5E521385BF85; Tue, 25 Jan 2022 20:18:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5E521385BF85 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6864] Fortran: optional argument DIM for intrinsics NORM2, PARITY must be scalar X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/master X-Git-Oldrev: bc90dd0ecf02e11d47d1af7f627e2e2acaa40106 X-Git-Newrev: 34e8dafb76240f69c729c11cfc8c8fc4f717bc17 Message-Id: <20220125201811.5E521385BF85@sourceware.org> Date: Tue, 25 Jan 2022 20:18:11 +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: Tue, 25 Jan 2022 20:18:11 -0000 https://gcc.gnu.org/g:34e8dafb76240f69c729c11cfc8c8fc4f717bc17 commit r12-6864-g34e8dafb76240f69c729c11cfc8c8fc4f717bc17 Author: Harald Anlauf Date: Mon Jan 24 21:40:41 2022 +0100 Fortran: optional argument DIM for intrinsics NORM2, PARITY must be scalar gcc/fortran/ChangeLog: PR fortran/104212 * check.cc (gfc_check_norm2): Check that optional argument DIM is scalar. (gfc_check_parity): Likewise. gcc/testsuite/ChangeLog: PR fortran/104212 * gfortran.dg/argument_checking_26.f90: New test. Diff: --- gcc/fortran/check.cc | 6 ++++++ gcc/testsuite/gfortran.dg/argument_checking_26.f90 | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/gcc/fortran/check.cc b/gcc/fortran/check.cc index 5fe8d452413..4fa05ee7e9b 100644 --- a/gcc/fortran/check.cc +++ b/gcc/fortran/check.cc @@ -4338,6 +4338,9 @@ gfc_check_norm2 (gfc_expr *array, gfc_expr *dim) if (!array_check (array, 0)) return false; + if (!dim_check (dim, 1, false)) + return false; + if (!dim_rank_check (dim, array, false)) return false; @@ -4476,6 +4479,9 @@ gfc_check_parity (gfc_expr *mask, gfc_expr *dim) if (!array_check (mask, 0)) return false; + if (!dim_check (dim, 1, false)) + return false; + if (!dim_rank_check (dim, mask, false)) return false; diff --git a/gcc/testsuite/gfortran.dg/argument_checking_26.f90 b/gcc/testsuite/gfortran.dg/argument_checking_26.f90 new file mode 100644 index 00000000000..2b765c5f866 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/argument_checking_26.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! PR fortran/104212 - ICE in transformational_result +! Contributed by G.Steinmetz + +program p + logical, parameter :: a(*,*) = reshape([.true.,.false.], shape=[1,2]) + real, parameter :: r(*,*) = reshape([1.,2.], shape=[1,2]) + print *, parity(a) + print *, parity(a, dim=1) + print *, parity(a, dim=[1]) ! { dg-error "must be a scalar" } + print *, norm2 (r) + print *, norm2 (r, dim=1) + print *, norm2 (r, dim=[1]) ! { dg-error "must be a scalar" } +end