From 7823229bc310fe007b397365afe17ee5e039a3af Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Tue, 13 Sep 2005 07:15:01 +0000 Subject: re PR fortran/19269 (transpose(reshape(...)) of character array segfaults.) gcc/fortran/ PR target/19269 * iresolve.c (gfc_resolve_cshift, gfc_resolve_eoshift) (gfc_resolve_pack, gfc_resolve_reshape, gfc_resolve_spread) (gfc_resolve_transpose, gfc_resolve_unpack): Add "_char" to the name for character-based operations. (gfc_resolve_pack): Remove ATTRIBUTE_UNUSED from array argument. (gfc_resolve_unpack): Copy the whole typespec from the vector. * trans-array.c (gfc_conv_expr_descriptor): In the EXPR_FUNCTION case, get the string length from the scalarization state. libgfortran/ PR target/19269 * intrinsics/cshift0.c (cshift0): Add an extra size argument. (cshift0_1, cshift0_2, cshift0_4, cshift0_8): Replace explicit implementations with... (DEFINE_CSHIFT): ...this new macro. Define character versions too. * intrinsics/eoshift0.c (zeros): Delete. (eoshift0): Add extra size and filler arguments. Use memset if no bound is provided. (eoshift0_1, eoshift0_2, eoshift0_4, eoshift0_8): Replace explicit implementations with... (DEFINE_EOSHIFT): ...this new macro. Define character versions too. * intrinsics/eoshift2.c (zeros): Delete. (eoshift2): Add extra size and filler arguments. Use memset if no bound is provided. (eoshift2_1, eoshift2_2, eoshift2_4, eoshift2_8): Replace explicit implementations with... (DEFINE_EOSHIFT): ...this new macro. Define character versions too. * intrinsics/pack.c (pack_internal): New static function, reusing the contents of pack and adding an extra size argument. Change "mptr" rather than "m" when calculating the array size. (pack): Redefine as a forwarder to pack_internal. (pack_s_internal): New static function, reusing the contents of pack_s and adding an extra size argument. (pack_s): Redefine as a forwarder to pack_s_internal. (pack_char, pack_s_char): New functions. * intrinsics/reshape.c (reshape_internal): New static function, reusing the contents of reshape and adding an extra size argument. (reshape): Redefine as a forwarder to reshape_internal. (reshape_char): New function. * intrinsics/spread.c (spread_internal): New static function, reusing the contents of spread and adding an extra size argument. (spread): Redefine as a forwarder to spread_internal. (spread_char): New function. * intrinsics/transpose.c (transpose_internal): New static function, reusing the contents of transpose and adding an extra size argument. (transpose): Redefine as a forwarder to transpose_internal. (transpose_char): New function. * intrinsics/unpack.c (unpack_internal): New static function, reusing the contents of unpack1 and adding extra size and fsize arguments. (unpack1): Redefine as a forwarder to unpack_internal. (unpack0): Call unpack_internal instead of unpack1. (unpack1_char, unpack0_char): New functions. * m4/cshift1.m4 (cshift1): New static function, reusing the contents of cshift1_ and adding an extra size argument. (cshift1_): Redefine as a forwarder to cshift1. (cshift1__char): New function. * m4/eoshift1.m4 (zeros): Delete. (eoshift1): New static function, reusing the contents of eoshift1_ and adding extra size and filler arguments. Fix calculation of hstride. Use memset if no bound is provided. (eoshift1_): Redefine as a forwarder to eoshift1. (eoshift1__char): New function. * m4/eoshift3.m4 (zeros): Delete. (eoshift3): New static function, reusing the contents of eoshift3_ and adding extra size and filler arguments. Use memset if no bound is provided. (eoshift3_): Redefine as a forwarder to eoshift3. (eoshift3__char): New function. * generated/cshift1_4.c, generated/cshift1_8.c, * generated/eoshift1_4.c, generated/eoshift1_8.c, * generated/eoshift3_4.c, generated/eoshift3_8.c: Regenerate. From-SVN: r104217 --- libgfortran/intrinsics/cshift0.c | 86 ++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 51 deletions(-) (limited to 'libgfortran/intrinsics/cshift0.c') diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c index e491e17..199e283 100644 --- a/libgfortran/intrinsics/cshift0.c +++ b/libgfortran/intrinsics/cshift0.c @@ -78,7 +78,7 @@ DEF_COPY_LOOP(cdouble, _Complex double) static void cshift0 (gfc_array_char * ret, const gfc_array_char * array, - ssize_t shift, int which) + ssize_t shift, int which, index_type size) { /* r.* indicates the return array. */ index_type rstride[GFC_MAX_DIMENSIONS]; @@ -95,7 +95,6 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; index_type dim; - index_type size; index_type len; index_type n; int whichloop; @@ -107,7 +106,6 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array, extent[0] = 1; count[0] = 0; - size = GFC_DESCRIPTOR_SIZE (array); n = 0; /* The values assigned here must match the cases in the inner loop. */ @@ -298,51 +296,37 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array, } } - -extern void cshift0_1 (gfc_array_char *, const gfc_array_char *, - const GFC_INTEGER_1 *, const GFC_INTEGER_1 *); -export_proto(cshift0_1); - -void -cshift0_1 (gfc_array_char *ret, const gfc_array_char *array, - const GFC_INTEGER_1 *pshift, const GFC_INTEGER_1 *pdim) -{ - cshift0 (ret, array, *pshift, pdim ? *pdim : 1); -} - - -extern void cshift0_2 (gfc_array_char *, const gfc_array_char *, - const GFC_INTEGER_2 *, const GFC_INTEGER_2 *); -export_proto(cshift0_2); - -void -cshift0_2 (gfc_array_char *ret, const gfc_array_char *array, - const GFC_INTEGER_2 *pshift, const GFC_INTEGER_2 *pdim) -{ - cshift0 (ret, array, *pshift, pdim ? *pdim : 1); -} - - -extern void cshift0_4 (gfc_array_char *, const gfc_array_char *, - const GFC_INTEGER_4 *, const GFC_INTEGER_4 *); -export_proto(cshift0_4); - -void -cshift0_4 (gfc_array_char *ret, const gfc_array_char *array, - const GFC_INTEGER_4 *pshift, const GFC_INTEGER_4 *pdim) -{ - cshift0 (ret, array, *pshift, pdim ? *pdim : 1); -} - - -extern void cshift0_8 (gfc_array_char *, const gfc_array_char *, - const GFC_INTEGER_8 *, const GFC_INTEGER_8 *); -export_proto(cshift0_8); - -void -cshift0_8 (gfc_array_char *ret, const gfc_array_char *array, - const GFC_INTEGER_8 *pshift, const GFC_INTEGER_8 *pdim) -{ - cshift0 (ret, array, *pshift, pdim ? *pdim : 1); -} - +#define DEFINE_CSHIFT(N) \ + extern void cshift0_##N (gfc_array_char *, const gfc_array_char *, \ + const GFC_INTEGER_##N *, const GFC_INTEGER_##N *); \ + export_proto(cshift0_##N); \ + \ + void \ + cshift0_##N (gfc_array_char *ret, const gfc_array_char *array, \ + const GFC_INTEGER_##N *pshift, const GFC_INTEGER_##N *pdim) \ + { \ + cshift0 (ret, array, *pshift, pdim ? *pdim : 1, \ + GFC_DESCRIPTOR_SIZE (array)); \ + } \ + \ + extern void cshift0_##N##_char (gfc_array_char *, GFC_INTEGER_4, \ + const gfc_array_char *, \ + const GFC_INTEGER_##N *, \ + const GFC_INTEGER_##N *, GFC_INTEGER_4); \ + export_proto(cshift0_##N##_char); \ + \ + void \ + cshift0_##N##_char (gfc_array_char *ret, \ + GFC_INTEGER_4 ret_length __attribute__((unused)), \ + const gfc_array_char *array, \ + const GFC_INTEGER_##N *pshift, \ + const GFC_INTEGER_##N *pdim, \ + GFC_INTEGER_4 array_length) \ + { \ + cshift0 (ret, array, *pshift, pdim ? *pdim : 1, array_length); \ + } + +DEFINE_CSHIFT (1); +DEFINE_CSHIFT (2); +DEFINE_CSHIFT (4); +DEFINE_CSHIFT (8); -- cgit v1.1