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 | |
| 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.
| -rw-r--r-- | gcc/fortran/simplify.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/ubound_1.f90 | 22 |
2 files changed, 33 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 diff --git a/gcc/testsuite/gfortran.dg/ubound_1.f90 b/gcc/testsuite/gfortran.dg/ubound_1.f90 new file mode 100644 index 0000000..7c588b0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/ubound_1.f90 @@ -0,0 +1,22 @@ +! { dg-do run } +! +! PR fortran/99027 +! + program test + integer, dimension (1:3,1:6) :: array + integer, dimension (2:5,3:7,4:9,-4:2) :: array2 + + if (any ([4] /= ubound (array (1, 1:4)))) stop 1 + if (4 /= ubound (array (1, 1:4), dim=1)) stop 2 + + if (any (ubound (array2 (3,3,4,:)) /= [4+1+2])) stop 3 + if ( ubound (array2 (3,3,4,:), dim=1) /= 4+1+2 ) stop 4 + + if (any (ubound (array2 (3,:,4,:)) /= [7-3+1, 4+1+2])) stop 5 + if ( ubound (array2 (3,:,4,:), dim=1) /= 7-3+1 ) stop 6 + if ( ubound (array2 (3,:,4,:), dim=2) /= 4+1+2) stop 7 + if (any (ubound (array2 (3,:,4:4,:)) /= [7-3+1, 1, 4+1+2])) stop 8 + if ( ubound (array2 (3,:,4:4,:), dim=1) /= 7-3+1 ) stop 9 + if ( ubound (array2 (3,:,4:4,:), dim=2) /= 1 ) stop 10 + if ( ubound (array2 (3,:,4:4,:), dim=3) /= 4+1+2) stop 11 + end program test |