From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 825743858C60; Sat, 4 Dec 2021 21:33:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 825743858C60 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 r11-9356] Fortran: error recovery when simplifying MINLOC/MAXLOC X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 9e9c674dfc6fae8f967341759699b4d75943d256 X-Git-Newrev: 3c1bcaa6224f79c6532dca28ebc7b466acbbc468 Message-Id: <20211204213340.825743858C60@sourceware.org> Date: Sat, 4 Dec 2021 21:33:40 +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: Sat, 04 Dec 2021 21:33:40 -0000 https://gcc.gnu.org/g:3c1bcaa6224f79c6532dca28ebc7b466acbbc468 commit r11-9356-g3c1bcaa6224f79c6532dca28ebc7b466acbbc468 Author: Harald Anlauf Date: Mon Nov 29 22:56:30 2021 +0100 Fortran: error recovery when simplifying MINLOC/MAXLOC gcc/fortran/ChangeLog: PR fortran/103473 * simplify.c (simplify_minmaxloc_nodim): Avoid NULL pointer dereference when shape is not set. gcc/testsuite/ChangeLog: PR fortran/103473 * gfortran.dg/minmaxloc_15.f90: New test. (cherry picked from commit 36421e76a7150621f2a5c7060ddd3f80aa825a40) Diff: --- gcc/fortran/simplify.c | 3 +++ gcc/testsuite/gfortran.dg/minmaxloc_15.f90 | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index ba0b3c4a362..77b982005fc 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -5280,6 +5280,9 @@ simplify_minmaxloc_nodim (gfc_expr *result, gfc_expr *extremum, && !mask->value.logical) goto finish; + if (array->shape == NULL) + goto finish; + for (i = 0; i < array->rank; i++) { count[i] = 0; diff --git a/gcc/testsuite/gfortran.dg/minmaxloc_15.f90 b/gcc/testsuite/gfortran.dg/minmaxloc_15.f90 new file mode 100644 index 00000000000..e4eba3501d5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/minmaxloc_15.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR fortran/103473 - ICE in simplify_minmaxloc_nodim +! Test case by Gerhard Steinmetz. + +subroutine s + implicit none + integer, parameter :: a(+'1') = [1] ! { dg-error "unary numeric operator" } + print *, minloc (a) +end + +! { dg-prune-output "Parameter array" }