diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2008-07-21 10:05:32 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2008-07-21 10:05:32 +0000 |
| commit | c44109aaf3be31a6816a8a4f3c4454261d8d2622 (patch) | |
| tree | 9f53b6a50b64cf1ac4935ade62445629885b9613 /libgfortran/intrinsics/cshift0.c | |
| parent | 1bb64668d0fbb2abfa3583918a256420028eea30 (diff) | |
| download | gcc-c44109aaf3be31a6816a8a4f3c4454261d8d2622.zip gcc-c44109aaf3be31a6816a8a4f3c4454261d8d2622.tar.gz gcc-c44109aaf3be31a6816a8a4f3c4454261d8d2622.tar.bz2 | |
re PR libfortran/36773 (zero-sized arrays with cshift and eoshift)
2008-07-21 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36773
* intrinsics/cshift0.c (cshift0): Return early if size of array
is zero.
* intrinsics/eoshift0.c (eoshift0): Return early if size of
return array is zero.
* intrinsics/eoshift2.c (eoshift2): Likewise.
* m4/eoshift1.m4 (eoshift1): Return early if size of array
is zero.
* m4/eoshift3.m4 (eoshift3): Likewise.
* m4/eoshift2.m4 (eoshift2): Return early if size of return
array is zero.
* m4/eoshift4.m4 (eoshift2): Return early if size of return
array is zero.
* generated/cshift1_16.c: Regenerated.
* generated/cshift1_4.c: Regenerated.
* generated/cshift1_8.c: Regenerated.
* generated/eoshift1_16.c: Regenerated.
* generated/eoshift1_4.c: Regenerated.
* generated/eoshift1_8.c: Regenerated.
* generated/eoshift3_16.c: Regenerated.
* generated/eoshift3_4.c: Regenerated.
* generated/eoshift3_8.c: Regenerated.
2008-07-21 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/36773
* gfortran.dg/zero_sized_5.f90: New test case.
From-SVN: r138027
Diffstat (limited to 'libgfortran/intrinsics/cshift0.c')
| -rw-r--r-- | libgfortran/intrinsics/cshift0.c | 61 |
1 files changed, 33 insertions, 28 deletions
diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c index 76ce97e..ac26e86 100644 --- a/libgfortran/intrinsics/cshift0.c +++ b/libgfortran/intrinsics/cshift0.c @@ -97,10 +97,43 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array, index_type len; index_type n; int whichloop; + index_type arraysize; if (which < 1 || which > GFC_DESCRIPTOR_RANK (array)) runtime_error ("Argument 'DIM' is out of range in call to 'CSHIFT'"); + arraysize = size0 ((array_t *) array); + + if (ret->data == NULL) + { + int i; + + ret->offset = 0; + ret->dtype = array->dtype; + for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) + { + ret->dim[i].lbound = 0; + ret->dim[i].ubound = array->dim[i].ubound - array->dim[i].lbound; + + if (i == 0) + ret->dim[i].stride = 1; + else + ret->dim[i].stride = (ret->dim[i-1].ubound + 1) + * ret->dim[i-1].stride; + } + + if (arraysize > 0) + ret->data = internal_malloc_size (size * arraysize); + else + { + ret->data = internal_malloc_size (1); + return; + } + } + + if (arraysize == 0) + return; + which = which - 1; sstride[0] = 0; rstride[0] = 0; @@ -142,34 +175,6 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array, soffset = size; len = 0; - if (ret->data == NULL) - { - int i; - index_type arraysize = size0 ((array_t *)array); - - ret->offset = 0; - ret->dtype = array->dtype; - for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) - { - ret->dim[i].lbound = 0; - ret->dim[i].ubound = array->dim[i].ubound - array->dim[i].lbound; - - if (i == 0) - ret->dim[i].stride = 1; - else - ret->dim[i].stride = (ret->dim[i-1].ubound + 1) - * ret->dim[i-1].stride; - } - - if (arraysize > 0) - ret->data = internal_malloc_size (size * arraysize); - else - { - ret->data = internal_malloc_size (1); - return; - } - } - for (dim = 0; dim < GFC_DESCRIPTOR_RANK (array); dim++) { if (dim == which) |