diff options
| author | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-21 10:05:32 +0000 |
|---|---|---|
| committer | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-21 10:05:32 +0000 |
| commit | 74a175c17d8f073fbb8782e042378518d18738ce (patch) | |
| tree | 9f53b6a50b64cf1ac4935ade62445629885b9613 /libgfortran/m4 | |
| parent | 4999c35b921bb613553d9f875e8cee3b39c80cc3 (diff) | |
| download | gcc-74a175c17d8f073fbb8782e042378518d18738ce.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@138027 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran/m4')
| -rw-r--r-- | libgfortran/m4/cshift1.m4 | 8 | ||||
| -rw-r--r-- | libgfortran/m4/eoshift1.m4 | 5 | ||||
| -rw-r--r-- | libgfortran/m4/eoshift3.m4 | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/libgfortran/m4/cshift1.m4 b/libgfortran/m4/cshift1.m4 index 28fae596bd4..861debeed2c 100644 --- a/libgfortran/m4/cshift1.m4 +++ b/libgfortran/m4/cshift1.m4 @@ -68,6 +68,7 @@ cshift1 (gfc_array_char * const restrict ret, index_type n; int which; 'atype_name` sh; + index_type arraysize; if (pwhich) which = *pwhich - 1; @@ -77,11 +78,13 @@ cshift1 (gfc_array_char * const restrict ret, if (which < 0 || (which + 1) > 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->data = internal_malloc_size (size * size0 ((array_t *)array)); + ret->data = internal_malloc_size (size * arraysize); ret->offset = 0; ret->dtype = array->dtype; for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) @@ -96,6 +99,9 @@ cshift1 (gfc_array_char * const restrict ret, } } + if (arraysize == 0) + return; + extent[0] = 1; count[0] = 0; n = 0; diff --git a/libgfortran/m4/eoshift1.m4 b/libgfortran/m4/eoshift1.m4 index 8ce24eff0f5..01ca57ec68d 100644 --- a/libgfortran/m4/eoshift1.m4 +++ b/libgfortran/m4/eoshift1.m4 @@ -103,6 +103,11 @@ eoshift1 (gfc_array_char * const restrict ret, ret->dim[i].stride = (ret->dim[i-1].ubound + 1) * ret->dim[i-1].stride; } } + else + { + if (size0 ((array_t *) ret) == 0) + return; + } n = 0; for (dim = 0; dim < GFC_DESCRIPTOR_RANK (array); dim++) diff --git a/libgfortran/m4/eoshift3.m4 b/libgfortran/m4/eoshift3.m4 index 081ff927277..6a6929ca0c7 100644 --- a/libgfortran/m4/eoshift3.m4 +++ b/libgfortran/m4/eoshift3.m4 @@ -104,6 +104,11 @@ eoshift3 (gfc_array_char * const restrict ret, ret->dim[i].stride = (ret->dim[i-1].ubound + 1) * ret->dim[i-1].stride; } } + else + { + if (size0 ((array_t *) ret) == 0) + return; + } extent[0] = 1; |