]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Fortran: error recovery when simplifying MINLOC/MAXLOC
authorHarald Anlauf <anlauf@gmx.de>
Mon, 29 Nov 2021 21:56:30 +0000 (22:56 +0100)
committerHarald Anlauf <anlauf@gmx.de>
Tue, 30 Nov 2021 19:20:56 +0000 (20:20 +0100)
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.

gcc/fortran/simplify.c
gcc/testsuite/gfortran.dg/minmaxloc_15.f90 [new file with mode: 0644]

index c9e13b59da9205e5ca63d93ac321c18e05827dec..fb7b7814603966ac4e3137a6975a5dd1f25cf7f1 100644 (file)
@@ -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 (file)
index 0000000..e4eba35
--- /dev/null
@@ -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" }