diff options
author | José Rui Faustino de Sousa <jrfsousa@gmail.com> | 2020-08-30 17:58:13 +0000 |
---|---|---|
committer | José Rui Faustino de Sousa <jrfsousa@gmail.com> | 2020-08-30 17:58:13 +0000 |
commit | 8f7d99acf6d94eed6a7f9b9f76bd4c2243c660b2 (patch) | |
tree | 33894bf7bf7f7f44eea7123a6cf8d1a87178bd93 | |
parent | cd49b7067893b548a10c99ea0cb6aba2977eef2e (diff) | |
download | gcc-8f7d99acf6d94eed6a7f9b9f76bd4c2243c660b2.zip gcc-8f7d99acf6d94eed6a7f9b9f76bd4c2243c660b2.tar.gz gcc-8f7d99acf6d94eed6a7f9b9f76bd4c2243c660b2.tar.bz2 |
2020-8-20 José Rui Faustino de Sousa <jrfsousa@gmail.com>
gcc/fortran/ChangeLog:
PR fortran/96726
* expr.c (check_references): Change different relational operator
to less-than operator to avoid infinite loop.
gcc/testsuite/ChangeLog:
PR fortran/96726
* gfortran.dg/PR96726.f90: New test.
-rw-r--r-- | gcc/fortran/expr.c | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/PR96726.f90 | 72 |
2 files changed, 73 insertions, 1 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 6707ca5..2ef01f0 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3273,7 +3273,7 @@ check_references (gfc_ref* ref, bool (*checker) (gfc_expr*)) switch (ref->type) { case REF_ARRAY: - for (dim = 0; dim != ref->u.ar.dimen; ++dim) + for (dim = 0; dim < ref->u.ar.dimen; ++dim) { if (!checker (ref->u.ar.start[dim])) return false; diff --git a/gcc/testsuite/gfortran.dg/PR96726.f90 b/gcc/testsuite/gfortran.dg/PR96726.f90 new file mode 100644 index 0000000..b0b26b9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/PR96726.f90 @@ -0,0 +1,72 @@ +! { dg-do run } +! +! Test the fix for PR96726 +! + +module cref_m + + implicit none + + private + + public :: & + sizeish + +contains + + pure function sizeish(a) result(s) + integer, intent(in) :: a(..) + + integer :: s + + s = size(a) + return + end function sizeish + +end module cref_m + +program cref_p + + use cref_m, only: & + sizeish + + implicit none + + integer :: i + + integer, parameter :: n = 3 + integer, parameter :: p(*) = [(i, i=1,n*n)] + + integer :: a(n,n) + integer :: b(n*n) + + a = reshape(p, shape=[n,n]) + call isub_a(a, b) + if (any(b/=p)) stop 1 + call isub_b(a, b) + if (any(b/=p)) stop 2 + stop + +contains + + subroutine isub_a(a, b) + integer, intent(in) :: a(..) + integer, intent(out) :: b(size(a)) + + integer :: i + + b = [(i, i=1,size(b))] + return + end subroutine isub_a + + subroutine isub_b(a, b) + integer, intent(in) :: a(..) + integer, intent(out) :: b(sizeish(a)) + + integer :: i + + b = [(i, i=1,sizeish(b))] + return + end subroutine isub_b + +end program cref_p |