diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2023-02-01 21:01:32 +0100 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2023-02-05 20:02:29 +0100 |
| commit | 1e60e9124543fd002f3e6dad8172cff8aa1b24b3 (patch) | |
| tree | e1f610e32ca5f201abd416163ddf8faa8ea74729 /gcc | |
| parent | 511928102dc9fa3f9c377e01f9bfb605b4995a61 (diff) | |
| download | gcc-1e60e9124543fd002f3e6dad8172cff8aa1b24b3.zip gcc-1e60e9124543fd002f3e6dad8172cff8aa1b24b3.tar.gz gcc-1e60e9124543fd002f3e6dad8172cff8aa1b24b3.tar.bz2 | |
Fortran: error recovery on invalid array section [PR108609]
The testcase for PR108527 uncovered a latent issue with invalid array
sections that resulted in different paths being taken on different
architectures. Detect the invalid array declaration for a clean recovery.
gcc/fortran/ChangeLog:
PR fortran/108609
* expr.cc (find_array_section): Add check to prevent interpreting an
mpz non-integer constant as an integer.
gcc/testsuite/ChangeLog:
PR fortran/108609
* gfortran.dg/pr108527.f90: Adjust test pattern.
(cherry picked from commit 88a2a09dd4529107e7ef7a6e7ce43acf96457173)
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/expr.cc | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr108527.f90 | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc index ab54d43..15d41d0 100644 --- a/gcc/fortran/expr.cc +++ b/gcc/fortran/expr.cc @@ -1552,7 +1552,11 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) lower = ref->u.ar.as->lower[d]; upper = ref->u.ar.as->upper[d]; - if (!lower || !upper) + if (!lower || !upper + || lower->expr_type != EXPR_CONSTANT + || upper->expr_type != EXPR_CONSTANT + || lower->ts.type != BT_INTEGER + || upper->ts.type != BT_INTEGER) { t = false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr108527.f90 b/gcc/testsuite/gfortran.dg/pr108527.f90 index c97ba31..8045148 100644 --- a/gcc/testsuite/gfortran.dg/pr108527.f90 +++ b/gcc/testsuite/gfortran.dg/pr108527.f90 @@ -4,7 +4,7 @@ program p integer, parameter :: a((2.)) = [4,8] ! { dg-error "must be of INTEGER type" } - integer(a(1:1)) :: b ! { dg-error "out of bounds" } + integer(a(1:1)) :: b ! { dg-error "Unclassifiable statement" } end ! { dg-prune-output "Parameter array" } |