From 042fed7915f1e924be61128d6409ad3eee2fe0a2 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Tue, 18 Nov 2008 22:43:05 +0000 Subject: re PR fortran/38135 (RESHAPE gives wrong result) 2008-11-18 Thomas Koenig PR libfortran/38135 * m4/reshape.m4: Correct bounds checking when PAD is present. Treat PAD as if it were SOURCE when SOURCE is empty. * intrinsics/reshape_generic.c: 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-18 Thomas Koenig PR libfortran/38135 * gfortran.dg/reshape_pad_1.f90: New test case. From-SVN: r141982 --- libgfortran/generated/reshape_r16.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libgfortran/generated/reshape_r16.c') diff --git a/libgfortran/generated/reshape_r16.c b/libgfortran/generated/reshape_r16.c index 286e374ff18..8a344e0b6ba 100644 --- a/libgfortran/generated/reshape_r16.c +++ b/libgfortran/generated/reshape_r16.c @@ -137,7 +137,7 @@ reshape_r16 (gfc_array_r16 * const restrict ret, source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound; - if (rs != source_extent) + if (rs < source_extent || (rs > source_extent && !pad)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" " intrinsic: is %ld, should be %ld", (long int) source_extent, (long int) rs); @@ -262,16 +262,16 @@ reshape_r16 (gfc_array_r16 * const restrict ret, if (sempty) { - /* Switch immediately to the pad array. */ + /* Pretend we are using the pad array the first time around, too. */ src = pptr; - sptr = NULL; + sptr = pptr; sdim = pdim; for (dim = 0; dim < pdim; dim++) { scount[dim] = pcount[dim]; sextent[dim] = pextent[dim]; sstride[dim] = pstride[dim]; - sstride0 = sstride[0] * sizeof (GFC_REAL_16); + sstride0 = pstride[0]; } } -- cgit v1.2.1