Fortran: fix ICE in get_expr_storage_size [PR108421]

gcc/fortran/ChangeLog:

	PR fortran/108421
	* interface.cc (get_expr_storage_size): Check that we actually have
	an integer value before trying to extract it with mpz_get_si.

gcc/testsuite/ChangeLog:

	PR fortran/108421
	* gfortran.dg/pr108421.f90: New test.

diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc
index c4f7faaf5975e1d0cac06517ff2b8c5a463b4a6a..9593fa83c459a66b4228707e15b5ec22f585738f 100644 (file)
--- a/gcc/fortran/interface.cc
+++ b/gcc/fortran/interface.cc
@@ -2858,7 +2858,8 @@ get_expr_storage_size (gfc_expr *e)
   if (e->ts.type == BT_CHARACTER)
     {
       if (e->ts.u.cl && e->ts.u.cl->length
-          && e->ts.u.cl->length->expr_type == EXPR_CONSTANT)
+         && e->ts.u.cl->length->expr_type == EXPR_CONSTANT
+         && e->ts.u.cl->length->ts.type == BT_INTEGER)
        strlen = mpz_get_si (e->ts.u.cl->length->value.integer);
       else if (e->expr_type == EXPR_CONSTANT
               && (e->ts.u.cl == NULL || e->ts.u.cl->length == NULL))

diff --git a/gcc/testsuite/gfortran.dg/pr108421.f90 b/gcc/testsuite/gfortran.dg/pr108421.f90
new file mode 100644 (file)
index 0000000..89439bc
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr108421.f90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+! PR fortran/108421
+! Contributed by G.Steinmetz
+
+program p
+  character(real(3)) :: c ! { dg-error "must be of INTEGER type" }
+  call s(c)
+end
+subroutine s(x)
+  character(*) :: x
+end