diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2008-11-22 21:41:27 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2008-11-22 21:41:27 +0000 |
| commit | a388c77976fdac5a5773a9b71ee5f1644352a362 (patch) | |
| tree | 6eef96808a54ab0bd4ddf78411a3d8f3000cd141 /libgfortran/intrinsics | |
| parent | 2ec855f1f74eb35dc8e2909b837ff7d8888d2220 (diff) | |
| download | gcc-a388c77976fdac5a5773a9b71ee5f1644352a362.zip gcc-a388c77976fdac5a5773a9b71ee5f1644352a362.tar.gz gcc-a388c77976fdac5a5773a9b71ee5f1644352a362.tar.bz2 | |
re PR libfortran/38225 (RESHAPE bounds with multi-dimensional SOURCE)
2008-11-22 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/38225
* intrinsics/reshape_generic.c (reshape_internal):
Use all dimensions of source for bounds checking.
* 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 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/38225
* gfortran.dg/reshape_3.f90: New test.
From-SVN: r142125
Diffstat (limited to 'libgfortran/intrinsics')
| -rw-r--r-- | libgfortran/intrinsics/reshape_generic.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c index 04b8727..8e1fedb 100644 --- a/libgfortran/intrinsics/reshape_generic.c +++ b/libgfortran/intrinsics/reshape_generic.c @@ -124,7 +124,14 @@ reshape_internal (parray *ret, parray *source, shape_type *shape, (long int) ret_extent, (long int) shape_data[n]); } - source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound; + source_extent = 1; + sdim = GFC_DESCRIPTOR_RANK (source); + for (n = 0; n < sdim; n++) + { + index_type se; + se = source->dim[n].ubound + 1 - source->dim[0].lbound; + source_extent *= se > 0 ? se : 0; + } if (rs < source_extent || (rs > source_extent && !pad)) runtime_error("Incorrect size in SOURCE argument to RESHAPE" |