From 49ff3ac005b869f836007ea2e900190f687b68d1 Mon Sep 17 00:00:00 2001 From: tkoenig Date: Sun, 23 Nov 2008 19:25:42 +0000 Subject: [PATCH] 2008-11-23 Thomas Koenig PR libfortran/38234 * intrinsics/reshape_generic.c (reshape_internal): Source can be larger than shape. * m4/reshape.m4: Likewise. * generated/reshape_c10.c Regenerated. * generated/reshape_c16.c Regenerated. * generated/reshape_c4.c Regenerated. * generated/reshape_c8.c Regenerated. * generated/reshape_i16.c Regenerated. * generated/reshape_i4.c Regenerated. * generated/reshape_i8.c Regenerated. * generated/reshape_r10.c Regenerated. * generated/reshape_r16.c Regenerated. * generated/reshape_r4.c Regenerated. * generated/reshape_r8.c Regenerated. 2008-11-23 Thomas Koenig PR libfortran/38234 * gfortran.dg/reshape_4.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142137 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gfortran.dg/reshape_4.f90 | 15 ++++++++ libgfortran/ChangeLog | 18 +++++++++ libgfortran/generated/reshape_c10.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_c16.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_c4.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_c8.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_i16.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_i4.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_i8.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_r10.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_r16.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_r4.c | 64 ++++++++++++++++---------------- libgfortran/generated/reshape_r8.c | 64 ++++++++++++++++---------------- libgfortran/intrinsics/reshape_generic.c | 64 ++++++++++++++++---------------- libgfortran/m4/reshape.m4 | 64 ++++++++++++++++---------------- 16 files changed, 454 insertions(+), 416 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/reshape_4.f90 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8feb7befa89..a83c305a393 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-11-23 Thomas Koenig + + PR libfortran/38234 + * gfortran.dg/reshape_4.f90: New test. + 2008-11-22 Thomas Koenig PR libfortran/38225 diff --git a/gcc/testsuite/gfortran.dg/reshape_4.f90 b/gcc/testsuite/gfortran.dg/reshape_4.f90 new file mode 100644 index 00000000000..92208e57da5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/reshape_4.f90 @@ -0,0 +1,15 @@ +! { dg-do run } +! { dg-options "-fbounds-check" } +program main + real, dimension(2,2) :: result + real, dimension(6) :: source + real, dimension(2) :: pad + + call random_number (source) + call random_number (pad) + + result = reshape(source, shape(result),pad=pad(1:0)) + result = reshape(source, shape(result)) + result = reshape(source, shape(result),pad=pad) + +end program main diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 353b88433c0..36c0098cab2 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,21 @@ +2008-11-23 Thomas Koenig + + PR libfortran/38234 + * intrinsics/reshape_generic.c (reshape_internal): + Source can be larger than shape. + * m4/reshape.m4: Likewise. + * generated/reshape_c10.c Regenerated. + * generated/reshape_c16.c Regenerated. + * generated/reshape_c4.c Regenerated. + * generated/reshape_c8.c Regenerated. + * generated/reshape_i16.c Regenerated. + * generated/reshape_i4.c Regenerated. + * generated/reshape_i8.c Regenerated. + * generated/reshape_r10.c Regenerated. + * generated/reshape_r16.c Regenerated. + * generated/reshape_r4.c Regenerated. + * generated/reshape_r8.c Regenerated. + 2008-11-22 Danny Smith * libgfortran.h (__mingw_snprintf): Declare with gnu_printf diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c index 33059948a64..53e59dbda84 100644 --- a/libgfortran/generated/reshape_c10.c +++ b/libgfortran/generated/reshape_c10.c @@ -119,6 +119,37 @@ reshape_c10 (gfc_array_c10 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_c10 (gfc_array_c10 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_c10 (gfc_array_c10 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_COMPLEX_10); diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c index 3b026a5028b..19cfdfcc31c 100644 --- a/libgfortran/generated/reshape_c16.c +++ b/libgfortran/generated/reshape_c16.c @@ -119,6 +119,37 @@ reshape_c16 (gfc_array_c16 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_c16 (gfc_array_c16 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_c16 (gfc_array_c16 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_COMPLEX_16); diff --git a/libgfortran/generated/reshape_c4.c b/libgfortran/generated/reshape_c4.c index 1c4740c7f0b..64156d938ea 100644 --- a/libgfortran/generated/reshape_c4.c +++ b/libgfortran/generated/reshape_c4.c @@ -119,6 +119,37 @@ reshape_c4 (gfc_array_c4 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_c4 (gfc_array_c4 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_c4 (gfc_array_c4 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_COMPLEX_4); diff --git a/libgfortran/generated/reshape_c8.c b/libgfortran/generated/reshape_c8.c index d68ea481ad3..5ba646ce112 100644 --- a/libgfortran/generated/reshape_c8.c +++ b/libgfortran/generated/reshape_c8.c @@ -119,6 +119,37 @@ reshape_c8 (gfc_array_c8 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_c8 (gfc_array_c8 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_c8 (gfc_array_c8 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_COMPLEX_8); diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c index f46d7586dfc..81223eae670 100644 --- a/libgfortran/generated/reshape_i16.c +++ b/libgfortran/generated/reshape_i16.c @@ -119,6 +119,37 @@ reshape_16 (gfc_array_i16 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_16 (gfc_array_i16 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_16 (gfc_array_i16 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_INTEGER_16); diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c index d868c936cc2..911f2d7a902 100644 --- a/libgfortran/generated/reshape_i4.c +++ b/libgfortran/generated/reshape_i4.c @@ -119,6 +119,37 @@ reshape_4 (gfc_array_i4 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_4 (gfc_array_i4 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_4 (gfc_array_i4 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_INTEGER_4); diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c index bcd984f1397..b5f9c1e19fc 100644 --- a/libgfortran/generated/reshape_i8.c +++ b/libgfortran/generated/reshape_i8.c @@ -119,6 +119,37 @@ reshape_8 (gfc_array_i8 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_8 (gfc_array_i8 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_8 (gfc_array_i8 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_INTEGER_8); diff --git a/libgfortran/generated/reshape_r10.c b/libgfortran/generated/reshape_r10.c index ac029593d98..57dca1aa888 100644 --- a/libgfortran/generated/reshape_r10.c +++ b/libgfortran/generated/reshape_r10.c @@ -119,6 +119,37 @@ reshape_r10 (gfc_array_r10 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_r10 (gfc_array_r10 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_r10 (gfc_array_r10 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_REAL_10); diff --git a/libgfortran/generated/reshape_r16.c b/libgfortran/generated/reshape_r16.c index c12fab5c399..4509df5b2bb 100644 --- a/libgfortran/generated/reshape_r16.c +++ b/libgfortran/generated/reshape_r16.c @@ -119,6 +119,37 @@ reshape_r16 (gfc_array_r16 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_r16 (gfc_array_r16 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_r16 (gfc_array_r16 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_REAL_16); diff --git a/libgfortran/generated/reshape_r4.c b/libgfortran/generated/reshape_r4.c index aa4bdec70d4..c9135577cbd 100644 --- a/libgfortran/generated/reshape_r4.c +++ b/libgfortran/generated/reshape_r4.c @@ -119,6 +119,37 @@ reshape_r4 (gfc_array_r4 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_r4 (gfc_array_r4 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_r4 (gfc_array_r4 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_REAL_4); diff --git a/libgfortran/generated/reshape_r8.c b/libgfortran/generated/reshape_r8.c index bacaaac05bc..33ce1f0bfbb 100644 --- a/libgfortran/generated/reshape_r8.c +++ b/libgfortran/generated/reshape_r8.c @@ -119,6 +119,37 @@ reshape_r8 (gfc_array_r8 * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -144,7 +175,7 @@ reshape_r8 (gfc_array_r8 * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -219,37 +250,6 @@ reshape_r8 (gfc_array_r8 * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof (GFC_REAL_8); diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c index 8e1fedb7a99..e1cc92abaf1 100644 --- a/libgfortran/intrinsics/reshape_generic.c +++ b/libgfortran/intrinsics/reshape_generic.c @@ -108,6 +108,37 @@ reshape_internal (parray *ret, parray *source, shape_type *shape, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -133,7 +164,7 @@ reshape_internal (parray *ret, parray *source, shape_type *shape, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -206,37 +237,6 @@ reshape_internal (parray *ret, parray *source, shape_type *shape, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= size; diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4 index aa5d42960f7..53a626e1cee 100644 --- a/libgfortran/m4/reshape.m4 +++ b/libgfortran/m4/reshape.m4 @@ -123,6 +123,37 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, if (shape_empty) return; + if (pad) + { + pdim = GFC_DESCRIPTOR_RANK (pad); + psize = 1; + pempty = 0; + for (n = 0; n < pdim; n++) + { + pcount[n] = 0; + pstride[n] = pad->dim[n].stride; + pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; + if (pextent[n] <= 0) + { + pempty = 1; + pextent[n] = 0; + } + + if (psize == pstride[n]) + psize *= pextent[n]; + else + psize = 0; + } + pptr = pad->data; + } + else + { + pdim = 0; + psize = 1; + pempty = 1; + pptr = NULL; + } + if (unlikely (compile_options.bounds_check)) { index_type ret_extent, source_extent; @@ -148,7 +179,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, source_extent *= se > 0 ? se : 0; } - if (rs < source_extent || (rs > source_extent && !pad)) + if (rs > source_extent && (!pad || pempty)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -223,37 +254,6 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, ssize = 0; } - if (pad) - { - pdim = GFC_DESCRIPTOR_RANK (pad); - psize = 1; - pempty = 0; - for (n = 0; n < pdim; n++) - { - pcount[n] = 0; - pstride[n] = pad->dim[n].stride; - pextent[n] = pad->dim[n].ubound + 1 - pad->dim[n].lbound; - if (pextent[n] <= 0) - { - pempty = 1; - pextent[n] = 0; - } - - if (psize == pstride[n]) - psize *= pextent[n]; - else - psize = 0; - } - pptr = pad->data; - } - else - { - pdim = 0; - psize = 1; - pempty = 1; - pptr = NULL; - } - if (rsize != 0 && ssize != 0 && psize != 0) { rsize *= sizeof ('rtype_name`); -- 2.11.0