https://gcc.gnu.org/g:dcd29e8c91a9dbb8c8f4b2ea4d5c6a745c259689
commit dcd29e8c91a9dbb8c8f4b2ea4d5c6a745c259689 Author: Mikael Morin <[email protected]> Date: Tue Sep 9 21:42:58 2025 +0200 Correction ifunction-s2.m4 Diff: --- libgfortran/m4/ifunction-s2.m4 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libgfortran/m4/ifunction-s2.m4 b/libgfortran/m4/ifunction-s2.m4 index c70cac4a154d..c5bc2ef590e7 100644 --- a/libgfortran/m4/ifunction-s2.m4 +++ b/libgfortran/m4/ifunction-s2.m4 @@ -69,11 +69,11 @@ void if (len < 0) len = 0; - delta = GFC_DESCRIPTOR_STRIDE_BYTES(array,dim) * string_len; + delta = GFC_DESCRIPTOR_STRIDE_BYTES(array,dim); for (n = 0; n < dim; n++) { - sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n) * string_len; + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); if (extent[n] < 0) @@ -81,7 +81,7 @@ void } for (n = dim; n < rank; n++) { - sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array, n + 1) * string_len; + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array, n + 1); extent[n] = GFC_DESCRIPTOR_EXTENT(array, n + 1); if (extent[n] < 0) @@ -128,7 +128,7 @@ void for (n = 0; n < rank; n++) { count[n] = 0; - dstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(retarray,n) * string_len; + dstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(retarray,n); if (extent[n] <= 0) return; } @@ -255,12 +255,12 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, else runtime_error ("Funny sized logical array"); - delta = GFC_DESCRIPTOR_STRIDE_BYTES(array,dim) * string_len; + delta = GFC_DESCRIPTOR_STRIDE_BYTES(array,dim); mdelta = GFC_DESCRIPTOR_STRIDE_BYTES(mask,dim); for (n = 0; n < dim; n++) { - sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n) * string_len; + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n); mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask,n); extent[n] = GFC_DESCRIPTOR_EXTENT(array,n); @@ -270,7 +270,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, } for (n = dim; n < rank; n++) { - sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n + 1) * string_len; + sstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(array,n + 1); mstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(mask, n + 1); extent[n] = GFC_DESCRIPTOR_EXTENT(array, n + 1); @@ -298,7 +298,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, retarray->offset = 0; retarray->dtype.rank = rank; - retarray->base_addr = xmallocarray (alloc_size, sizeof (rtype_name)); + retarray->base_addr = xmallocarray (alloc_size, sizeof ('rtype_name`)); if (alloc_size == 0) return; } @@ -319,7 +319,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, for (n = 0; n < rank; n++) { count[n] = 0; - dstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(retarray,n) * string_len; + dstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(retarray,n); if (extent[n] <= 0) return; } @@ -329,7 +329,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, while (base) { - const atype_name * restrict src; + const 'atype_name` * restrict src; const GFC_LOGICAL_1 * restrict msrc; src = base; @@ -457,7 +457,7 @@ s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, alloc_size = GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1] * string_len; - retarray->base_addr = xmallocarray (alloc_size, sizeof (rtype_name)); + retarray->base_addr = xmallocarray (alloc_size, sizeof ('rtype_name`)); if (alloc_size == 0) return; } @@ -488,7 +488,7 @@ s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, for (n = 0; n < rank; n++) { count[n] = 0; - dstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(retarray,n) * string_len; + dstride[n] = GFC_DESCRIPTOR_STRIDE_BYTES(retarray,n); } dest = retarray->base_addr;
