diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2008-02-02 13:50:55 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2008-02-02 13:50:55 +0000 |
| commit | ee440dd05de292dde12376f8a977d2a4bf22c2c3 (patch) | |
| tree | 41b636e47d1922843adc517116bfd40c4acb7428 /libgfortran/generated | |
| parent | 27f56cb1f2c371e33b32e1adb1f0f571c1266c41 (diff) | |
| download | gcc-ee440dd05de292dde12376f8a977d2a4bf22c2c3.zip gcc-ee440dd05de292dde12376f8a977d2a4bf22c2c3.tar.gz gcc-ee440dd05de292dde12376f8a977d2a4bf22c2c3.tar.bz2 | |
re PR libfortran/35001 (shape for negative sizes)
2008-02-02 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/35001
* m4/shape.m4: Return 0 for extents <= 0.
* generated/shape_i4.c: Regenerated.
* generated/shape_i8.c: Regenerated.
* generated/shape_i16.c: Regenerated.
2008-02-02 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/35001
* gfortran.dg/shape_4.f90: New test.
Fixed in regression-only mode by special dispense (see the PR).
From-SVN: r132070
Diffstat (limited to 'libgfortran/generated')
| -rw-r--r-- | libgfortran/generated/shape_i16.c | 5 | ||||
| -rw-r--r-- | libgfortran/generated/shape_i4.c | 5 | ||||
| -rw-r--r-- | libgfortran/generated/shape_i8.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/libgfortran/generated/shape_i16.c b/libgfortran/generated/shape_i16.c index 77274d6..0ab2654 100644 --- a/libgfortran/generated/shape_i16.c +++ b/libgfortran/generated/shape_i16.c @@ -45,6 +45,7 @@ shape_16 (gfc_array_i16 * const restrict ret, { int n; index_type stride; + index_type extent; stride = ret->dim[0].stride; @@ -53,8 +54,8 @@ shape_16 (gfc_array_i16 * const restrict ret, for (n = 0; n < GFC_DESCRIPTOR_RANK (array); n++) { - ret->data[n * stride] = - array->dim[n].ubound + 1 - array->dim[n].lbound; + extent = array->dim[n].ubound + 1 - array->dim[n].lbound; + ret->data[n * stride] = extent > 0 ? extent : 0 ; } } diff --git a/libgfortran/generated/shape_i4.c b/libgfortran/generated/shape_i4.c index 787ba54..64a6fcd 100644 --- a/libgfortran/generated/shape_i4.c +++ b/libgfortran/generated/shape_i4.c @@ -45,6 +45,7 @@ shape_4 (gfc_array_i4 * const restrict ret, { int n; index_type stride; + index_type extent; stride = ret->dim[0].stride; @@ -53,8 +54,8 @@ shape_4 (gfc_array_i4 * const restrict ret, for (n = 0; n < GFC_DESCRIPTOR_RANK (array); n++) { - ret->data[n * stride] = - array->dim[n].ubound + 1 - array->dim[n].lbound; + extent = array->dim[n].ubound + 1 - array->dim[n].lbound; + ret->data[n * stride] = extent > 0 ? extent : 0 ; } } diff --git a/libgfortran/generated/shape_i8.c b/libgfortran/generated/shape_i8.c index f318b17..80bef31 100644 --- a/libgfortran/generated/shape_i8.c +++ b/libgfortran/generated/shape_i8.c @@ -45,6 +45,7 @@ shape_8 (gfc_array_i8 * const restrict ret, { int n; index_type stride; + index_type extent; stride = ret->dim[0].stride; @@ -53,8 +54,8 @@ shape_8 (gfc_array_i8 * const restrict ret, for (n = 0; n < GFC_DESCRIPTOR_RANK (array); n++) { - ret->data[n * stride] = - array->dim[n].ubound + 1 - array->dim[n].lbound; + extent = array->dim[n].ubound + 1 - array->dim[n].lbound; + ret->data[n * stride] = extent > 0 ? extent : 0 ; } } |