From 0e6d033bc892f6f79683dcbbda0e6a1987685bf4 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sat, 25 Jun 2005 09:56:37 +0000 Subject: [multiple changes] 2005-06-25 Thomas Koenig PR libfortran/22144 * m4/cshift1.m4: Remove const from argument ret. Populate return array descriptor if ret->data is NULL. * m4/eoshift1.m4: Likewise. * m4/eoshift3.m4: Likewise. * generated/cshift1_4.c: Regenerated. * generated/cshift1_8.c: Regenerated. * generated/eoshift1_4.c: Regenerated. * generated/eoshift1_8.c: Regenerated. * generated/eoshift3_4.c: Regenerated. * generated/eoshift3_8.c: Regenerated. 2005-06-25 Thomas Koenig PR libfortran/21144 * gfortran.dg/shift-alloc.f90: New testcase. From-SVN: r101318 --- libgfortran/generated/cshift1_4.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'libgfortran/generated/cshift1_4.c') diff --git a/libgfortran/generated/cshift1_4.c b/libgfortran/generated/cshift1_4.c index 683ce70..b86f9e5 100644 --- a/libgfortran/generated/cshift1_4.c +++ b/libgfortran/generated/cshift1_4.c @@ -34,13 +34,13 @@ Boston, MA 02111-1307, USA. */ #include #include "libgfortran.h" -void cshift1_4 (const gfc_array_char * ret, +void cshift1_4 (gfc_array_char * ret, const gfc_array_char * array, const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich); export_proto(cshift1_4); void -cshift1_4 (const gfc_array_char * ret, +cshift1_4 (gfc_array_char * ret, const gfc_array_char * array, const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich) { @@ -80,6 +80,25 @@ cshift1_4 (const gfc_array_char * ret, size = GFC_DESCRIPTOR_SIZE (ret); + if (ret->data == NULL) + { + int i; + + ret->data = internal_malloc_size (size * size0 ((array_t *)array)); + ret->base = 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; + } + } + extent[0] = 1; count[0] = 0; size = GFC_DESCRIPTOR_SIZE (array); -- cgit v1.1