diff options
author | Harald Anlauf <anlauf@gmx.de> | 2023-01-16 21:30:56 +0100 |
---|---|---|
committer | Harald Anlauf <anlauf@gmx.de> | 2023-01-17 19:35:17 +0100 |
commit | a75760374ee54768e5fd6a27080698bfbbd041ab (patch) | |
tree | ee9ec4885db6f9a8a56905de13d9a647f3b91626 | |
parent | 6d80690132a2f00fae1f619d4ffd950ce8cfdbc7 (diff) | |
download | gcc-a75760374ee54768e5fd6a27080698bfbbd041ab.zip gcc-a75760374ee54768e5fd6a27080698bfbbd041ab.tar.gz gcc-a75760374ee54768e5fd6a27080698bfbbd041ab.tar.bz2 |
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.
-rw-r--r-- | gcc/fortran/interface.cc | 3 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/pr108421.f90 | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc index c4f7faa..9593fa8 100644 --- 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 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 |