From 8f96b844606a4a9ca9c43c26f1875a8db276ecbb Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Fri, 3 Aug 2012 16:00:50 +0000 Subject: [PATCH] re PR fortran/54166 (ICE rank-1 assignment to rank-2 array section) fortran/ PR fortran/54166 * trans-array.c (set_loop_bounds): Access specinfo using spec_dim. testsuite/ PR fortran/54166 * gfortran.dg/array_5.f90: New test. From-SVN: r190130 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/trans-array.c | 4 ++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/array_5.f90 | 24 ++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/array_5.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 90442800d54..fef8abad3ce 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2012-08-03 Mikael Morin + + PR fortran/54166 + * trans-array.c (set_loop_bounds): Access specinfo using spec_dim. + 2012-08-02 Mikael Morin PR fortran/48820 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 187eab01b00..ef25a36f107 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -4503,9 +4503,9 @@ set_loop_bounds (gfc_loopinfo *loop) else if (INTEGER_CST_P (info->start[dim]) && !INTEGER_CST_P (specinfo->start[spec_dim]) && integer_onep (info->stride[dim]) - == integer_onep (specinfo->stride[dim]) + == integer_onep (specinfo->stride[spec_dim]) && INTEGER_CST_P (info->stride[dim]) - == INTEGER_CST_P (specinfo->stride[dim])) + == INTEGER_CST_P (specinfo->stride[spec_dim])) loopspec[n] = ss; /* We don't work out the upper bound. else if (INTEGER_CST_P (info->finish[n]) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b7486f97c28..448dc5dc428 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-08-03 Mikael Morin + + PR fortran/54166 + * gfortran.dg/array_5.f90: New test. + 2012-08-03 Marc Glisse PR tree-optimization/30318 diff --git a/gcc/testsuite/gfortran.dg/array_5.f90 b/gcc/testsuite/gfortran.dg/array_5.f90 new file mode 100644 index 00000000000..82ab243a6b1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/array_5.f90 @@ -0,0 +1,24 @@ +! { dg-do compile } +! +! PR fortran/54166 +! There was an ICE while chosing the bounds to scalarize the FAIL line. +! +! Contributed by Koen Poppe +! + +module ds_routines +contains + subroutine dsget(vertic,rstore) + real, dimension(:), intent(in out) :: rstore + real, dimension(:,:), intent(out) :: vertic + integer :: nrvert,point + nrvert = 4 + point = 26 + vertic(1,1:nrvert) = rstore(point+1:point+nrvert) ! FAIL + end subroutine dsget +end module ds_routines + +program ds_routines_program + use ds_routines + print *, "ok" +end program ds_routines_program