]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Fortran: error recovery from calculation of storage size of a symbol [PR103504]
authorHarald Anlauf <anlauf@gmx.de>
Mon, 25 Jul 2022 20:29:50 +0000 (22:29 +0200)
committerHarald Anlauf <anlauf@gmx.de>
Tue, 26 Jul 2022 18:25:59 +0000 (20:25 +0200)
gcc/fortran/ChangeLog:

PR fortran/103504
* interface.cc (get_sym_storage_size): Array bounds and character
length can only be of integer type.

gcc/testsuite/ChangeLog:

PR fortran/103504
* gfortran.dg/pr103504.f90: New test.

(cherry picked from commit 600956c81c784f4a0cc9d10f6e03e01847afd961)

gcc/fortran/interface.cc
gcc/testsuite/gfortran.dg/pr103504.f90 [new file with mode: 0644]

index 7ed6e13711f92bab8bc25103cb1c71816d458c30..71eec78259bd4feef951dffcffc665a35c8c1301 100644 (file)
@@ -2792,7 +2792,8 @@ get_sym_storage_size (gfc_symbol *sym)
   if (sym->ts.type == BT_CHARACTER)
     {
       if (sym->ts.u.cl && sym->ts.u.cl->length
-          && sym->ts.u.cl->length->expr_type == EXPR_CONSTANT)
+         && sym->ts.u.cl->length->expr_type == EXPR_CONSTANT
+         && sym->ts.u.cl->length->ts.type == BT_INTEGER)
        strlen = mpz_get_ui (sym->ts.u.cl->length->value.integer);
       else
        return 0;
@@ -2809,7 +2810,9 @@ get_sym_storage_size (gfc_symbol *sym)
   for (i = 0; i < sym->as->rank; i++)
     {
       if (sym->as->upper[i]->expr_type != EXPR_CONSTANT
-         || sym->as->lower[i]->expr_type != EXPR_CONSTANT)
+         || sym->as->lower[i]->expr_type != EXPR_CONSTANT
+         || sym->as->upper[i]->ts.type != BT_INTEGER
+         || sym->as->lower[i]->ts.type != BT_INTEGER)
        return 0;
 
       elements *= mpz_get_si (sym->as->upper[i]->value.integer)
diff --git a/gcc/testsuite/gfortran.dg/pr103504.f90 b/gcc/testsuite/gfortran.dg/pr103504.f90
new file mode 100644 (file)
index 0000000..607d1c6
--- /dev/null
@@ -0,0 +1,28 @@
+! { dg-do compile }
+! PR fortran/103504 - ICE in get_sym_storage_size, at fortran/interface.c:2800
+! Contributed by G.Steinmetz
+
+program p
+  implicit none
+  real      :: y(1)
+  character :: b
+  call s(y)
+  call t(y)
+  call u(y)
+  call c(b)
+contains
+  subroutine s(x)
+    real :: x(abs(1.):1)        ! { dg-error "must be of INTEGER type" }
+  end
+  subroutine t(x)
+    real :: x(abs(1.):1)        ! { dg-error "must be of INTEGER type" }
+  end
+  subroutine u(x)
+    real :: x(1:abs(1.))        ! { dg-error "must be of INTEGER type" }
+  end
+  subroutine c(z)
+    character(len=abs(1.)) :: z ! { dg-error "must be of INTEGER type" }
+  end subroutine c
+end
+
+! { dg-prune-output "must be of INTEGER type" }