From: tkoenig Date: Mon, 21 Jul 2008 10:05:32 +0000 (+0000) Subject: 2008-07-21 Thomas Koenig X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=74a175c17d8f073fbb8782e042378518d18738ce;p=pf3gnuchains%2Fgcc-fork.git 2008-07-21 Thomas Koenig 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 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 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 13f14681780..d02787b284a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-07-21 Thomas Koenig + + PR libfortran/36773 + * gfortran.dg/zero_sized_5.f90: New test case. + 2008-07-21 Paolo Carlini PR c++/36870 diff --git a/gcc/testsuite/gfortran.dg/zero_sized_5.f90 b/gcc/testsuite/gfortran.dg/zero_sized_5.f90 new file mode 100644 index 00000000000..30ca8bf8199 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/zero_sized_5.f90 @@ -0,0 +1,15 @@ +! { dg-do run } +! These used to segfault. +program main + real, dimension(1,0) :: a, b, c + integer, dimension(0) :: j + a = 0 + c = 0 + b = cshift (a,1) + b = cshift (a,j) + b = eoshift (a,1) + b = eoshift (a,(/1/)) + b = eoshift (a,1,boundary=c(1,:)) + b = eoshift (a, j, boundary=c(1,:)) + +end program main diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 48a20e99d21..b485123cb7b 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,28 @@ +2008-07-21 Thomas Koenig + + 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-20 Jerry DeLisle PR fortran/36857 diff --git a/libgfortran/generated/cshift1_16.c b/libgfortran/generated/cshift1_16.c index 2943c3ed86d..06e27468e85 100644 --- a/libgfortran/generated/cshift1_16.c +++ b/libgfortran/generated/cshift1_16.c @@ -67,6 +67,7 @@ cshift1 (gfc_array_char * const restrict ret, index_type n; int which; GFC_INTEGER_16 sh; + index_type arraysize; if (pwhich) which = *pwhich - 1; @@ -76,11 +77,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++) @@ -95,6 +98,9 @@ cshift1 (gfc_array_char * const restrict ret, } } + if (arraysize == 0) + return; + extent[0] = 1; count[0] = 0; n = 0; diff --git a/libgfortran/generated/cshift1_4.c b/libgfortran/generated/cshift1_4.c index 3f4f9e0bf25..3be3c3c15a6 100644 --- a/libgfortran/generated/cshift1_4.c +++ b/libgfortran/generated/cshift1_4.c @@ -67,6 +67,7 @@ cshift1 (gfc_array_char * const restrict ret, index_type n; int which; GFC_INTEGER_4 sh; + index_type arraysize; if (pwhich) which = *pwhich - 1; @@ -76,11 +77,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++) @@ -95,6 +98,9 @@ cshift1 (gfc_array_char * const restrict ret, } } + if (arraysize == 0) + return; + extent[0] = 1; count[0] = 0; n = 0; diff --git a/libgfortran/generated/cshift1_8.c b/libgfortran/generated/cshift1_8.c index 4d246e54d95..b444a691acc 100644 --- a/libgfortran/generated/cshift1_8.c +++ b/libgfortran/generated/cshift1_8.c @@ -67,6 +67,7 @@ cshift1 (gfc_array_char * const restrict ret, index_type n; int which; GFC_INTEGER_8 sh; + index_type arraysize; if (pwhich) which = *pwhich - 1; @@ -76,11 +77,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++) @@ -95,6 +98,9 @@ cshift1 (gfc_array_char * const restrict ret, } } + if (arraysize == 0) + return; + extent[0] = 1; count[0] = 0; n = 0; diff --git a/libgfortran/generated/eoshift1_16.c b/libgfortran/generated/eoshift1_16.c index 63b75bdbd6b..fd145c12e6e 100644 --- a/libgfortran/generated/eoshift1_16.c +++ b/libgfortran/generated/eoshift1_16.c @@ -102,6 +102,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/generated/eoshift1_4.c b/libgfortran/generated/eoshift1_4.c index 58ce7e9f5dd..d78c40a1113 100644 --- a/libgfortran/generated/eoshift1_4.c +++ b/libgfortran/generated/eoshift1_4.c @@ -102,6 +102,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/generated/eoshift1_8.c b/libgfortran/generated/eoshift1_8.c index 0e9c2f1442a..06d55323369 100644 --- a/libgfortran/generated/eoshift1_8.c +++ b/libgfortran/generated/eoshift1_8.c @@ -102,6 +102,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/generated/eoshift3_16.c b/libgfortran/generated/eoshift3_16.c index 214f3783d4f..66a507773ac 100644 --- a/libgfortran/generated/eoshift3_16.c +++ b/libgfortran/generated/eoshift3_16.c @@ -103,6 +103,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; diff --git a/libgfortran/generated/eoshift3_4.c b/libgfortran/generated/eoshift3_4.c index e96ef2504b0..3579cffd483 100644 --- a/libgfortran/generated/eoshift3_4.c +++ b/libgfortran/generated/eoshift3_4.c @@ -103,6 +103,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; diff --git a/libgfortran/generated/eoshift3_8.c b/libgfortran/generated/eoshift3_8.c index dc39b94eb97..de969a0c92b 100644 --- a/libgfortran/generated/eoshift3_8.c +++ b/libgfortran/generated/eoshift3_8.c @@ -103,6 +103,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; diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c index 76ce97e0f10..ac26e86cf5f 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) diff --git a/libgfortran/intrinsics/eoshift0.c b/libgfortran/intrinsics/eoshift0.c index ac7a0ba85b6..fd216b1084b 100644 --- a/libgfortran/intrinsics/eoshift0.c +++ b/libgfortran/intrinsics/eoshift0.c @@ -84,6 +84,11 @@ eoshift0 (gfc_array_char * ret, const gfc_array_char * array, ret->dim[i].stride = (ret->dim[i-1].ubound + 1) * ret->dim[i-1].stride; } } + else + { + if (size0 ((array_t *) ret) == 0) + return; + } which = which - 1; diff --git a/libgfortran/intrinsics/eoshift2.c b/libgfortran/intrinsics/eoshift2.c index 239d9714a99..aa66a8dfe00 100644 --- a/libgfortran/intrinsics/eoshift2.c +++ b/libgfortran/intrinsics/eoshift2.c @@ -63,6 +63,7 @@ eoshift2 (gfc_array_char *ret, const gfc_array_char *array, index_type dim; index_type len; index_type n; + index_type arraysize; /* The compiler cannot figure out that these are set, initialize them to avoid warnings. */ @@ -70,11 +71,13 @@ eoshift2 (gfc_array_char *ret, const gfc_array_char *array, soffset = 0; roffset = 0; + 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++) @@ -88,6 +91,14 @@ eoshift2 (gfc_array_char *ret, const gfc_array_char *array, ret->dim[i].stride = (ret->dim[i-1].ubound + 1) * ret->dim[i-1].stride; } } + else + { + if (size0 ((array_t *) ret) == 0) + return; + } + + if (arraysize == 0 && filler == NULL) + return; which = which - 1; 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;