diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2011-06-28 18:59:04 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2011-06-28 18:59:04 +0000 |
| commit | 19b76346c046b95ee4360a5c35d1e3a846aba6f4 (patch) | |
| tree | 065be10e884faa1cf29e82bd342b95d03ee62f80 /gcc | |
| parent | 6138f9bd8783881a1bd7dcfb917a3bfcefcf8cf9 (diff) | |
| download | gcc-19b76346c046b95ee4360a5c35d1e3a846aba6f4.zip gcc-19b76346c046b95ee4360a5c35d1e3a846aba6f4.tar.gz gcc-19b76346c046b95ee4360a5c35d1e3a846aba6f4.tar.bz2 | |
re PR fortran/49479 (reshape / optionals / zero sized arrays)
2011-06-28 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/49479
* m4/reshape.m4: If source allocation is smaller than one, set it
to one.
* intrinsics/reshape_generic.c: Likewise.
* generated/reshape_r16.c: Regenerated.
* generated/reshape_c4.c: Regenerated.
* generated/reshape_c16.c: Regenerated.
* generated/reshape_c8.c: Regenerated.
* generated/reshape_r4.c: Regenerated.
* generated/reshape_i4.c: Regenerated.
* generated/reshape_r10.c: Regenerated.
* generated/reshape_r8.c: Regenerated.
* generated/reshape_c10.c: Regenerated.
* generated/reshape_i8.c: Regenerated.
* generated/reshape_i16.c: Regenerated.
2011-06-28 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/49479
* gfortran.dg/reshape_zerosize_3.f90: New test.
From-SVN: r175594
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/reshape_zerosize_3.f90 | 43 |
2 files changed, 48 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d270b3e..77a4086 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-06-28 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/49479 + * gfortran.dg/reshape_zerosize_3.f90: New test. + 2011-06-28 Janis Johnson <janisjo@codesourcery.com> * gcc.target/arm/vfp-ldmdbs.c: Skip for soft float. diff --git a/gcc/testsuite/gfortran.dg/reshape_zerosize_3.f90 b/gcc/testsuite/gfortran.dg/reshape_zerosize_3.f90 new file mode 100644 index 0000000..870a76c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/reshape_zerosize_3.f90 @@ -0,0 +1,43 @@ +! { dg-do run } +! PR 49479 - this used not to print anything. +! Test case by Joost VandeVondele. +MODULE M1 + IMPLICIT NONE + type foo + character(len=5) :: x + end type foo +CONTAINS + SUBROUTINE S1(data) + INTEGER, DIMENSION(:), INTENT(IN), & + OPTIONAL :: DATA + character(20) :: line + IF (.not. PRESENT(data)) call abort + write (unit=line,fmt='(I5)') size(data) + if (line /= ' 0 ') call abort + END SUBROUTINE S1 + + subroutine s_type(data) + type(foo), dimension(:), intent(in), optional :: data + character(20) :: line + IF (.not. PRESENT(data)) call abort + write (unit=line,fmt='(I5)') size(data) + if (line /= ' 0 ') call abort + end subroutine s_type + + SUBROUTINE S2(N) + INTEGER :: N + INTEGER, ALLOCATABLE, DIMENSION(:, :) :: blki + type(foo), allocatable, dimension(:, :) :: bar + ALLOCATE(blki(3,N)) + allocate (bar(3,n)) + blki=0 + CALL S1(RESHAPE(blki,(/3*N/))) + call s_type(reshape(bar, (/3*N/))) + END SUBROUTINE S2 + +END MODULE M1 + +USE M1 +CALL S2(0) +END +! { dg-final { cleanup-modules "m1" } } |