public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/sphinx] Fortran: error recovery from calculation of storage size of a symbol [PR103504]
@ 2022-07-28 12:09 Martin Liska
  0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2022-07-28 12:09 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:cad8f2e62d6df769feea8ee30b507381764d18d1

commit cad8f2e62d6df769feea8ee30b507381764d18d1
Author: Harald Anlauf <anlauf@gmx.de>
Date:   Mon Jul 25 22:29:50 2022 +0200

    Fortran: error recovery from calculation of storage size of a symbol [PR103504]
    
    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.

Diff:
---
 gcc/fortran/interface.cc               |  7 +++++--
 gcc/testsuite/gfortran.dg/pr103504.f90 | 28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc
index 7ed6e13711f..71eec78259b 100644
--- a/gcc/fortran/interface.cc
+++ b/gcc/fortran/interface.cc
@@ -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
index 00000000000..607d1c6c8cc
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr103504.f90
@@ -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" }


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-28 12:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-28 12:09 [gcc/devel/sphinx] Fortran: error recovery from calculation of storage size of a symbol [PR103504] Martin Liska

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).