diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2021-09-13 19:26:35 +0200 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2021-09-13 19:26:35 +0200 |
| commit | 8d93ba93d3b13ac3d3c34404cad87732c809605b (patch) | |
| tree | c2482ed83729581e4e37154c081a3568003fee08 | |
| parent | 6c79057fae6bbb36c4a4fd61c5b7107a16b71b17 (diff) | |
| download | gcc-8d93ba93d3b13ac3d3c34404cad87732c809605b.zip gcc-8d93ba93d3b13ac3d3c34404cad87732c809605b.tar.gz gcc-8d93ba93d3b13ac3d3c34404cad87732c809605b.tar.bz2 | |
Fortran - fix handling of substring start and end indices
gcc/fortran/ChangeLog:
PR fortran/85130
* expr.c (find_substring_ref): Handle given substring start and
end indices as signed integers, not unsigned.
gcc/testsuite/ChangeLog:
PR fortran/85130
* gfortran.dg/substr_6.f90: Revert commit r8-7574, adding again
test that was erroneously considered as illegal.
| -rw-r--r-- | gcc/fortran/expr.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/substr_6.f90 | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index dfecc30..604e63e 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1724,8 +1724,8 @@ find_substring_ref (gfc_expr *p, gfc_expr **newp) *newp = gfc_copy_expr (p); free ((*newp)->value.character.string); - end = (gfc_charlen_t) mpz_get_ui (p->ref->u.ss.end->value.integer); - start = (gfc_charlen_t) mpz_get_ui (p->ref->u.ss.start->value.integer); + end = (gfc_charlen_t) mpz_get_si (p->ref->u.ss.end->value.integer); + start = (gfc_charlen_t) mpz_get_si (p->ref->u.ss.start->value.integer); if (end >= start) length = end - start + 1; else diff --git a/gcc/testsuite/gfortran.dg/substr_6.f90 b/gcc/testsuite/gfortran.dg/substr_6.f90 index 0d5e3d7..83e788a 100644 --- a/gcc/testsuite/gfortran.dg/substr_6.f90 +++ b/gcc/testsuite/gfortran.dg/substr_6.f90 @@ -6,6 +6,8 @@ CHARACTER(5), parameter :: c0(1) = (/ "123" // ACHAR(0) // "5" /) CHARACTER*5 c(1) CHARACTER(1), parameter :: c1(5) = (/ "1", "2", "3", ACHAR(0), "5" /) +c = c0(1)(-5:-8) +if (c(1) /= " ") STOP 1 c = (/ c0(1)(1:5) /) do i=1,5 if (c(1)(i:i) /= c1(i)) STOP 2 |