From c44109aaf3be31a6816a8a4f3c4454261d8d2622 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Mon, 21 Jul 2008 10:05:32 +0000 Subject: re PR libfortran/36773 (zero-sized arrays with cshift and eoshift) 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. From-SVN: r138027 --- libgfortran/generated/cshift1_4.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libgfortran/generated/cshift1_4.c') diff --git a/libgfortran/generated/cshift1_4.c b/libgfortran/generated/cshift1_4.c index 3f4f9e0b..3be3c3c 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; -- cgit v1.1