https://gcc.gnu.org/g:54c9c143568edcaeaa5eb72e9cd6529df22c70aa
commit 54c9c143568edcaeaa5eb72e9cd6529df22c70aa Author: Mikael Morin <mik...@gcc.gnu.org> Date: Tue May 20 10:04:55 2025 +0200 Correction régressions minloc_string maxloc_string Diff: --- libgfortran/generated/maxloc0_16_s1.c | 4 +-- libgfortran/generated/maxloc0_16_s4.c | 4 +-- libgfortran/generated/maxloc0_4_s1.c | 4 +-- libgfortran/generated/maxloc0_4_s4.c | 4 +-- libgfortran/generated/maxloc0_8_s1.c | 4 +-- libgfortran/generated/maxloc0_8_s4.c | 4 +-- libgfortran/generated/minloc0_16_s1.c | 4 +-- libgfortran/generated/minloc0_16_s4.c | 4 +-- libgfortran/generated/minloc0_4_s1.c | 4 +-- libgfortran/generated/minloc0_4_s4.c | 4 +-- libgfortran/generated/minloc0_8_s1.c | 4 +-- libgfortran/generated/minloc0_8_s4.c | 4 +-- libgfortran/m4/iforeach-s.m4 | 62 +++++++++++++++++------------------ 13 files changed, 55 insertions(+), 55 deletions(-) diff --git a/libgfortran/generated/maxloc0_16_s1.c b/libgfortran/generated/maxloc0_16_s1.c index e5e81dd28a83..7056d7fca55b 100644 --- a/libgfortran/generated/maxloc0_16_s1.c +++ b/libgfortran/generated/maxloc0_16_s1.c @@ -83,7 +83,7 @@ maxloc0_16_s1 (gfc_array_i16 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mmaxloc0_16_s1 (gfc_array_i16 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/maxloc0_16_s4.c b/libgfortran/generated/maxloc0_16_s4.c index 20ef05fb3268..095f8a169e93 100644 --- a/libgfortran/generated/maxloc0_16_s4.c +++ b/libgfortran/generated/maxloc0_16_s4.c @@ -83,7 +83,7 @@ maxloc0_16_s4 (gfc_array_i16 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mmaxloc0_16_s4 (gfc_array_i16 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/maxloc0_4_s1.c b/libgfortran/generated/maxloc0_4_s1.c index 629b544fab1c..a14058d17352 100644 --- a/libgfortran/generated/maxloc0_4_s1.c +++ b/libgfortran/generated/maxloc0_4_s1.c @@ -83,7 +83,7 @@ maxloc0_4_s1 (gfc_array_i4 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mmaxloc0_4_s1 (gfc_array_i4 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/maxloc0_4_s4.c b/libgfortran/generated/maxloc0_4_s4.c index de596da6638c..6c2e2d3339d6 100644 --- a/libgfortran/generated/maxloc0_4_s4.c +++ b/libgfortran/generated/maxloc0_4_s4.c @@ -83,7 +83,7 @@ maxloc0_4_s4 (gfc_array_i4 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mmaxloc0_4_s4 (gfc_array_i4 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/maxloc0_8_s1.c b/libgfortran/generated/maxloc0_8_s1.c index 3482fbc6d283..85cfa97e3d8f 100644 --- a/libgfortran/generated/maxloc0_8_s1.c +++ b/libgfortran/generated/maxloc0_8_s1.c @@ -83,7 +83,7 @@ maxloc0_8_s1 (gfc_array_i8 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mmaxloc0_8_s1 (gfc_array_i8 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/maxloc0_8_s4.c b/libgfortran/generated/maxloc0_8_s4.c index 2617c64b182c..6634d7a9a4bb 100644 --- a/libgfortran/generated/maxloc0_8_s4.c +++ b/libgfortran/generated/maxloc0_8_s4.c @@ -83,7 +83,7 @@ maxloc0_8_s4 (gfc_array_i8 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mmaxloc0_8_s4 (gfc_array_i8 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/minloc0_16_s1.c b/libgfortran/generated/minloc0_16_s1.c index 72f7b2e2066a..c5f600de2f82 100644 --- a/libgfortran/generated/minloc0_16_s1.c +++ b/libgfortran/generated/minloc0_16_s1.c @@ -83,7 +83,7 @@ minloc0_16_s1 (gfc_array_i16 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mminloc0_16_s1 (gfc_array_i16 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/minloc0_16_s4.c b/libgfortran/generated/minloc0_16_s4.c index 14625bd4f954..bd1c5f551ef8 100644 --- a/libgfortran/generated/minloc0_16_s4.c +++ b/libgfortran/generated/minloc0_16_s4.c @@ -83,7 +83,7 @@ minloc0_16_s4 (gfc_array_i16 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mminloc0_16_s4 (gfc_array_i16 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/minloc0_4_s1.c b/libgfortran/generated/minloc0_4_s1.c index c53371d0b333..001693a99eeb 100644 --- a/libgfortran/generated/minloc0_4_s1.c +++ b/libgfortran/generated/minloc0_4_s1.c @@ -83,7 +83,7 @@ minloc0_4_s1 (gfc_array_i4 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mminloc0_4_s1 (gfc_array_i4 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/minloc0_4_s4.c b/libgfortran/generated/minloc0_4_s4.c index f2fc3dc26af8..ad06948320a2 100644 --- a/libgfortran/generated/minloc0_4_s4.c +++ b/libgfortran/generated/minloc0_4_s4.c @@ -83,7 +83,7 @@ minloc0_4_s4 (gfc_array_i4 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mminloc0_4_s4 (gfc_array_i4 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/minloc0_8_s1.c b/libgfortran/generated/minloc0_8_s1.c index 368f8076652c..95929c742ee2 100644 --- a/libgfortran/generated/minloc0_8_s1.c +++ b/libgfortran/generated/minloc0_8_s1.c @@ -83,7 +83,7 @@ minloc0_8_s1 (gfc_array_i8 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mminloc0_8_s1 (gfc_array_i8 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/generated/minloc0_8_s4.c b/libgfortran/generated/minloc0_8_s4.c index 72f7c54e5cc9..470025cda31b 100644 --- a/libgfortran/generated/minloc0_8_s4.c +++ b/libgfortran/generated/minloc0_8_s4.c @@ -83,7 +83,7 @@ minloc0_8_s4 (gfc_array_i8 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) @@ -224,7 +224,7 @@ mminloc0_8_s4 (gfc_array_i8 * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; diff --git a/libgfortran/m4/iforeach-s.m4 b/libgfortran/m4/iforeach-s.m4 index 81a0d1d1c557..51c9ccfb34d6 100644 --- a/libgfortran/m4/iforeach-s.m4 +++ b/libgfortran/m4/iforeach-s.m4 @@ -13,20 +13,20 @@ compare_fcn (const atype_name *a, const atype_name *b, gfc_charlen_type n) } -extern void name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, +extern void 'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, 'atype` * const restrict array'back_arg`, gfc_charlen_type len); -export_proto('name`'rtype_qual`_'atype_code); +export_proto('name`'rtype_qual`_'atype_code`); void -name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, +'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, 'atype` * const restrict array'back_arg`, gfc_charlen_type len) { index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; index_type sspacing[GFC_MAX_DIMENSIONS]; index_type dspacing; - const 'atype_name *base; - rtype_name * restrict dest; + const 'atype_name` *base; + 'rtype_name` * restrict dest; index_type rank; index_type n; @@ -36,10 +36,10 @@ name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, if (retarray->base_addr == NULL) { - GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof (rtype_name)); + GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof ('rtype_name`)); retarray->dtype.rank = 1; retarray->offset = 0; - retarray->base_addr = xmallocarray (rank, sizeof (rtype_name)); + retarray->base_addr = xmallocarray (rank, sizeof ('rtype_name`)); } else { @@ -52,14 +52,14 @@ name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; if (extent[n] <= 0) { /* Set the return value. */ for (n = 0; n < rank; n++) - GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = 0; + GFC_ARRAY_ELEM ('rtype_name`, dest, n * dspacing) = 0; return; } } @@ -68,7 +68,7 @@ name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = 1; + GFC_ARRAY_ELEM ('rtype_name`, dest, n * dspacing) = 1; { ')dnl define(START_FOREACH_BLOCK, @@ -112,13 +112,13 @@ define(FINISH_FOREACH_FUNCTION, }')dnl define(START_MASKED_FOREACH_FUNCTION, ` -extern void `m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict, +extern void m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict, 'atype` * const restrict, gfc_array_l1 * const restrict 'back_arg`, gfc_charlen_type len); export_proto(m'name`'rtype_qual`_'atype_code`); void -m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, +m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, 'atype` * const restrict array, gfc_array_l1 * const restrict mask'back_arg`, gfc_charlen_type len) @@ -128,7 +128,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, index_type sspacing[GFC_MAX_DIMENSIONS]; index_type mspacing[GFC_MAX_DIMENSIONS]; index_type dspacing; - 'rtype_name *dest; + 'rtype_name` *dest; const atype_name *base; GFC_LOGICAL_1 *mbase; int rank; @@ -137,10 +137,10 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, if (mask == NULL) { -#ifdef HAVE_BACK_ARG - name`'rtype_qual`_'atype_code (retarray, array, back, len); +#ifdef HAVE_BACK_ARG + 'name`'rtype_qual`_'atype_code` (retarray, array, back, len); #else - name`'rtype_qual`_'atype_code (retarray, array, len); + 'name`'rtype_qual`_'atype_code` (retarray, array, len); #endif return; } @@ -151,10 +151,10 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, if (retarray->base_addr == NULL) { - GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof (rtype_name)); + GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof ('rtype_name`)); retarray->dtype.rank = 1; retarray->offset = 0; - retarray->base_addr = xmallocarray (rank, sizeof (rtype_name)); + retarray->base_addr = xmallocarray (rank, sizeof ('rtype_name`)); } else { @@ -185,7 +185,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, dest = retarray->base_addr; for (n = 0; n < rank; n++) { - sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n) * len; + sspacing[n] = GFC_DESCRIPTOR_SPACING(array,n); mspacing[n] = GFC_DESCRIPTOR_SPACING(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); count[n] = 0; @@ -193,7 +193,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, { /* Set the return value. */ for (n = 0; n < rank; n++) - GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = 0; + GFC_ARRAY_ELEM ('rtype_name`, dest, n * dspacing) = 0; return; } } @@ -202,7 +202,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, /* Initialize the return value. */ for (n = 0; n < rank; n++) - GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = 0; + GFC_ARRAY_ELEM ('rtype_name`, dest, n * dspacing) = 0; { ')dnl define(START_MASKED_FOREACH_BLOCK, `START_FOREACH_BLOCK')dnl @@ -255,13 +255,13 @@ $2 FINISH_MASKED_FOREACH_FUNCTION')dnl define(SCALAR_FOREACH_FUNCTION, ` -extern void `s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict, +extern void s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict, 'atype` * const restrict, GFC_LOGICAL_4 *'back_arg`, gfc_charlen_type len); -export_proto(s'name`'rtype_qual`_'atype_code); +export_proto(s'name`'rtype_qual`_'atype_code`); void -`s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, +s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, 'atype` * const restrict array, GFC_LOGICAL_4 * mask'back_arg`, gfc_charlen_type len) @@ -269,14 +269,14 @@ void index_type rank; index_type dspacing; index_type n; - 'rtype_name *dest; + 'rtype_name` *dest; if (mask == NULL || *mask) { -#ifdef HAVE_BACK_ARG - name`'rtype_qual`_'atype_code (retarray, array, back, len); +#ifdef HAVE_BACK_ARG + 'name`'rtype_qual`_'atype_code` (retarray, array, back, len); #else - name`'rtype_qual`_'atype_code (retarray, array, len); + 'name`'rtype_qual`_'atype_code` (retarray, array, len); #endif return; } @@ -288,10 +288,10 @@ void if (retarray->base_addr == NULL) { - GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof (rtype_name)); + GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof ('rtype_name`)); retarray->dtype.rank = 1; retarray->offset = 0; - retarray->base_addr = xmallocarray (rank, sizeof (rtype_name)); + retarray->base_addr = xmallocarray (rank, sizeof ('rtype_name`)); } else if (unlikely (compile_options.bounds_check)) { @@ -302,5 +302,5 @@ void dspacing = GFC_DESCRIPTOR_SPACING(retarray,0); dest = retarray->base_addr; for (n = 0; n<rank; n++) - GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = $1 ; + GFC_ARRAY_ELEM ('rtype_name`, dest, n * dspacing) = $1 ; }')dnl