]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Fortran: error recovery for bad initializers of implied-shape arrays [PR106209]
authorHarald Anlauf <anlauf@gmx.de>
Thu, 14 Jul 2022 20:24:55 +0000 (22:24 +0200)
committerHarald Anlauf <anlauf@gmx.de>
Thu, 14 Jul 2022 20:25:48 +0000 (22:25 +0200)
gcc/fortran/ChangeLog:

PR fortran/106209
* decl.cc (add_init_expr_to_sym): Handle bad initializers for
implied-shape arrays.

gcc/testsuite/ChangeLog:

PR fortran/106209
* gfortran.dg/pr106209.f90: New test.

Co-authored-by: Steven G. Kargl <kargl@gcc.gnu.org>
gcc/fortran/decl.cc
gcc/testsuite/gfortran.dg/pr106209.f90 [new file with mode: 0644]

index 339f8b1503589bce8e95d0bed71a034ab37fac16..b640051473112af20b23954a0f58670426e34ef0 100644 (file)
@@ -2129,10 +2129,21 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus)
          /* The shape may be NULL for EXPR_ARRAY, set it.  */
          if (init->shape == NULL)
            {
-             gcc_assert (init->expr_type == EXPR_ARRAY);
+             if (init->expr_type != EXPR_ARRAY)
+               {
+                 gfc_error ("Bad shape of initializer at %L", &init->where);
+                 return false;
+               }
+
              init->shape = gfc_get_shape (1);
              if (!gfc_array_size (init, &init->shape[0]))
-                 gfc_internal_error ("gfc_array_size failed");
+               {
+                 gfc_error ("Cannot determine shape of initializer at %L",
+                            &init->where);
+                 free (init->shape);
+                 init->shape = NULL;
+                 return false;
+               }
            }
 
          for (dim = 0; dim < sym->as->rank; ++dim)
diff --git a/gcc/testsuite/gfortran.dg/pr106209.f90 b/gcc/testsuite/gfortran.dg/pr106209.f90
new file mode 100644 (file)
index 0000000..44f9233
--- /dev/null
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! PR fortran/106209 - ICE in add_init_expr_to_sym
+! Contributed by G.Steinmetz
+
+program p
+  integer, parameter :: a(:) = 0   ! { dg-error "of deferred shape" }
+  integer, parameter :: b(*) = a   ! { dg-error "Bad shape of initializer" }
+  integer, parameter :: c(*) = [a] ! { dg-error "Cannot determine shape" }
+end