https://gcc.gnu.org/g:73fefff0b5723b02c517f0bf11f022133630924e
commit 73fefff0b5723b02c517f0bf11f022133630924e Author: Mikael Morin <[email protected]> Date: Tue Sep 9 22:04:28 2025 +0200 Correction ifunction-s.m4 Diff: --- libgfortran/m4/ifunction-s.m4 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libgfortran/m4/ifunction-s.m4 b/libgfortran/m4/ifunction-s.m4 index 084b8ac29589..e5a4d6e3a829 100644 --- a/libgfortran/m4/ifunction-s.m4 +++ b/libgfortran/m4/ifunction-s.m4 @@ -68,11 +68,11 @@ void len = GFC_DESCRIPTOR_EXTENT(array,dim); 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) @@ -80,7 +80,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) @@ -106,7 +106,7 @@ void alloc_size = GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; - retarray->base_addr = xmallocarray (alloc_size, sizeof (rtype_name)); + retarray->base_addr = xmallocarray (alloc_size, sizeof ('rtype_name`)); if (alloc_size == 0) return; } @@ -126,7 +126,7 @@ void for (n = 0; n < rank; n++) { count[n] = 0; - dstride[n] = GFC_DESCRIPTOR_STRIDE(retarray,n); + 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); @@ -297,7 +297,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; } @@ -455,7 +455,7 @@ s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray, alloc_size = GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; - retarray->base_addr = xmallocarray (alloc_size, sizeof (rtype_name)); + retarray->base_addr = xmallocarray (alloc_size, sizeof ('rtype_name`)); if (alloc_size == 0) return; }
