diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2021-02-19 10:42:15 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2021-02-19 10:42:15 +0100 |
| commit | f600f271b10d0214b111f2aa52a3d5740477e139 (patch) | |
| tree | 810888630a9f38f4684a76dba90c74deea810dd8 /gcc/fortran/simplify.c | |
| parent | 6070e39cd0af6ac4a88004c8b1b6a900a8bbce36 (diff) | |
| download | gcc-f600f271b10d0214b111f2aa52a3d5740477e139.zip gcc-f600f271b10d0214b111f2aa52a3d5740477e139.tar.gz gcc-f600f271b10d0214b111f2aa52a3d5740477e139.tar.bz2 | |
Fortran: Fix ubound simplifcation [PR99027]
gcc/fortran/ChangeLog:
PR fortran/99027
* simplify.c (simplify_bound_dim): Honor DIMEN_ELEMENT
when using dim=.
gcc/testsuite/ChangeLog:
PR fortran/99027
* gfortran.dg/ubound_1.f90: New test.
Diffstat (limited to 'gcc/fortran/simplify.c')
| -rw-r--r-- | gcc/fortran/simplify.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 23317a2..35f267d 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -4168,7 +4168,17 @@ simplify_bound_dim (gfc_expr *array, gfc_expr *kind, int d, int upper, { if (upper) { - if (!gfc_ref_dimen_size (&ref->u.ar, d - 1, &result->value.integer, NULL)) + int d2 = 0, cnt = 0; + for (int idx = 0; idx < ref->u.ar.dimen; ++idx) + { + if (ref->u.ar.dimen_type[idx] == DIMEN_ELEMENT) + d2++; + else if (cnt < d - 1) + cnt++; + else + break; + } + if (!gfc_ref_dimen_size (&ref->u.ar, d2 + d - 1, &result->value.integer, NULL)) goto returnNull; } else |