diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2008-11-18 22:43:05 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2008-11-18 22:43:05 +0000 |
| commit | 042fed7915f1e924be61128d6409ad3eee2fe0a2 (patch) | |
| tree | 97cecaa39e4576d0bc34005844bc138cb8810cbc /libgfortran/m4 | |
| parent | 7a401a0df37dd6d55bf20b75ddf977f1b14c98f7 (diff) | |
| download | gcc-042fed7915f1e924be61128d6409ad3eee2fe0a2.zip gcc-042fed7915f1e924be61128d6409ad3eee2fe0a2.tar.gz gcc-042fed7915f1e924be61128d6409ad3eee2fe0a2.tar.bz2 | |
re PR fortran/38135 (RESHAPE gives wrong result)
2008-11-18 Thomas Koenig <tkoenig@gcc.gnu.org>
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 <tkoenig@gcc.gnu.org>
PR libfortran/38135
* gfortran.dg/reshape_pad_1.f90: New test case.
From-SVN: r141982
Diffstat (limited to 'libgfortran/m4')
| -rw-r--r-- | libgfortran/m4/reshape.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4 index 8d7ea72..b7e321e 100644 --- a/libgfortran/m4/reshape.m4 +++ b/libgfortran/m4/reshape.m4 @@ -141,7 +141,7 @@ reshape_'rtype_ccode` ('rtype` * 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); @@ -266,16 +266,16 @@ reshape_'rtype_ccode` ('rtype` * 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 ('rtype_name`); + sstride0 = pstride[0]; } } |