Dear all,
we currently may ICE when array bounds of a dummy argument have
a non-integer type, and the procedure with the bad declaration is
referenced. The same applies to bad character length of dummies.
We could simply punt in such a situation, as the causing error
seems to be reliably diagnosed, see testcase.
Regtested on x86_64-pc-linux-gnu. OK for mainline?
This is a really safe fix and potentially backportable to other
open branches. Would that be fine?
Thanks,
Harald
From 04bea97afd7f17083774b4309ee4d3c45e278dd3 Mon Sep 17 00:00:00 2001
From: Harald Anlauf <anl...@gmx.de>
Date: Mon, 25 Jul 2022 22:29:50 +0200
Subject: [PATCH] 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.
---
gcc/fortran/interface.cc | 7 +++++--
gcc/testsuite/gfortran.dg/pr103504.f90 | 28 ++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/pr103504.f90
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" }
--
2.35.3
