diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2021-11-29 22:56:30 +0100 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2021-11-30 20:20:56 +0100 |
| commit | 36421e76a7150621f2a5c7060ddd3f80aa825a40 (patch) | |
| tree | fccabb72616b12892788d5ad4eae573d02e218f5 /gcc | |
| parent | 814f52a8bfc66aff8c453b040f0e730b034b7f52 (diff) | |
| download | gcc-36421e76a7150621f2a5c7060ddd3f80aa825a40.zip gcc-36421e76a7150621f2a5c7060ddd3f80aa825a40.tar.gz gcc-36421e76a7150621f2a5c7060ddd3f80aa825a40.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/simplify.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/minmaxloc_15.f90 | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index c9e13b5..fb7b781 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 0000000..e4eba35 --- /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" } |