https://gcc.gnu.org/g:ebe1140a19e6784e807987e88d042faca7f55a05
commit ebe1140a19e6784e807987e88d042faca7f55a05 Author: Mikael Morin <[email protected]> Date: Sat Sep 13 20:37:29 2025 +0200 Régénération fichiers générés Régénération fichiers générés Régénération fichiers générés Diff: --- libgfortran/generated/cshift0_c10.c | 11 ++++------- libgfortran/generated/cshift0_c16.c | 11 ++++------- libgfortran/generated/cshift0_c17.c | 11 ++++------- libgfortran/generated/cshift0_c4.c | 11 ++++------- libgfortran/generated/cshift0_c8.c | 11 ++++------- libgfortran/generated/cshift0_i1.c | 11 ++++------- libgfortran/generated/cshift0_i16.c | 11 ++++------- libgfortran/generated/cshift0_i2.c | 11 ++++------- libgfortran/generated/cshift0_i4.c | 11 ++++------- libgfortran/generated/cshift0_i8.c | 11 ++++------- libgfortran/generated/cshift0_r10.c | 11 ++++------- libgfortran/generated/cshift0_r16.c | 11 ++++------- libgfortran/generated/cshift0_r17.c | 11 ++++------- libgfortran/generated/cshift0_r4.c | 11 ++++------- libgfortran/generated/cshift0_r8.c | 11 ++++------- 15 files changed, 60 insertions(+), 105 deletions(-) diff --git a/libgfortran/generated/cshift0_c10.c b/libgfortran/generated/cshift0_c10.c index 9b8d57303430..28e5f01e86ba 100644 --- a/libgfortran/generated/cshift0_c10.c +++ b/libgfortran/generated/cshift0_c10.c @@ -47,7 +47,6 @@ cshift0_c10 (gfc_array_c10 *ret, const gfc_array_c10 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_c10 (gfc_array_c10 *ret, const gfc_array_c10 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_c10 (gfc_array_c10 *ret, const gfc_array_c10 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_c10 (gfc_array_c10 *ret, const gfc_array_c10 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_COMPLEX_10); roffset = sizeof (GFC_COMPLEX_10); soffset = sizeof (GFC_COMPLEX_10); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_c16.c b/libgfortran/generated/cshift0_c16.c index d89b538c7476..cbcd45d9c34b 100644 --- a/libgfortran/generated/cshift0_c16.c +++ b/libgfortran/generated/cshift0_c16.c @@ -47,7 +47,6 @@ cshift0_c16 (gfc_array_c16 *ret, const gfc_array_c16 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_c16 (gfc_array_c16 *ret, const gfc_array_c16 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_c16 (gfc_array_c16 *ret, const gfc_array_c16 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_c16 (gfc_array_c16 *ret, const gfc_array_c16 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_COMPLEX_16); roffset = sizeof (GFC_COMPLEX_16); soffset = sizeof (GFC_COMPLEX_16); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_c17.c b/libgfortran/generated/cshift0_c17.c index a47be7d04ade..a5fbfda368dd 100644 --- a/libgfortran/generated/cshift0_c17.c +++ b/libgfortran/generated/cshift0_c17.c @@ -47,7 +47,6 @@ cshift0_c17 (gfc_array_c17 *ret, const gfc_array_c17 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_c17 (gfc_array_c17 *ret, const gfc_array_c17 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_c17 (gfc_array_c17 *ret, const gfc_array_c17 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_c17 (gfc_array_c17 *ret, const gfc_array_c17 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_COMPLEX_17); roffset = sizeof (GFC_COMPLEX_17); soffset = sizeof (GFC_COMPLEX_17); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_c4.c b/libgfortran/generated/cshift0_c4.c index 5120d7270a46..4b82a71c048b 100644 --- a/libgfortran/generated/cshift0_c4.c +++ b/libgfortran/generated/cshift0_c4.c @@ -47,7 +47,6 @@ cshift0_c4 (gfc_array_c4 *ret, const gfc_array_c4 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_c4 (gfc_array_c4 *ret, const gfc_array_c4 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_c4 (gfc_array_c4 *ret, const gfc_array_c4 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_c4 (gfc_array_c4 *ret, const gfc_array_c4 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_COMPLEX_4); roffset = sizeof (GFC_COMPLEX_4); soffset = sizeof (GFC_COMPLEX_4); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_c8.c b/libgfortran/generated/cshift0_c8.c index 116ca9317887..cfd2a97aaf03 100644 --- a/libgfortran/generated/cshift0_c8.c +++ b/libgfortran/generated/cshift0_c8.c @@ -47,7 +47,6 @@ cshift0_c8 (gfc_array_c8 *ret, const gfc_array_c8 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_c8 (gfc_array_c8 *ret, const gfc_array_c8 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_c8 (gfc_array_c8 *ret, const gfc_array_c8 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_c8 (gfc_array_c8 *ret, const gfc_array_c8 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_COMPLEX_8); roffset = sizeof (GFC_COMPLEX_8); soffset = sizeof (GFC_COMPLEX_8); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_i1.c b/libgfortran/generated/cshift0_i1.c index 9b2bc94afd57..a51dd428b4e3 100644 --- a/libgfortran/generated/cshift0_i1.c +++ b/libgfortran/generated/cshift0_i1.c @@ -47,7 +47,6 @@ cshift0_i1 (gfc_array_i1 *ret, const gfc_array_i1 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_i1 (gfc_array_i1 *ret, const gfc_array_i1 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_i1 (gfc_array_i1 *ret, const gfc_array_i1 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_i1 (gfc_array_i1 *ret, const gfc_array_i1 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_INTEGER_1); roffset = sizeof (GFC_INTEGER_1); soffset = sizeof (GFC_INTEGER_1); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_i16.c b/libgfortran/generated/cshift0_i16.c index 26a7bbf8dadd..fc617f8b5cc9 100644 --- a/libgfortran/generated/cshift0_i16.c +++ b/libgfortran/generated/cshift0_i16.c @@ -47,7 +47,6 @@ cshift0_i16 (gfc_array_i16 *ret, const gfc_array_i16 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_i16 (gfc_array_i16 *ret, const gfc_array_i16 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_i16 (gfc_array_i16 *ret, const gfc_array_i16 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_i16 (gfc_array_i16 *ret, const gfc_array_i16 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_INTEGER_16); roffset = sizeof (GFC_INTEGER_16); soffset = sizeof (GFC_INTEGER_16); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_i2.c b/libgfortran/generated/cshift0_i2.c index 9e72ed23fbff..6d0318b78ab0 100644 --- a/libgfortran/generated/cshift0_i2.c +++ b/libgfortran/generated/cshift0_i2.c @@ -47,7 +47,6 @@ cshift0_i2 (gfc_array_i2 *ret, const gfc_array_i2 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_i2 (gfc_array_i2 *ret, const gfc_array_i2 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_i2 (gfc_array_i2 *ret, const gfc_array_i2 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_i2 (gfc_array_i2 *ret, const gfc_array_i2 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_INTEGER_2); roffset = sizeof (GFC_INTEGER_2); soffset = sizeof (GFC_INTEGER_2); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_i4.c b/libgfortran/generated/cshift0_i4.c index 7843d3d96aca..651a204d3ff3 100644 --- a/libgfortran/generated/cshift0_i4.c +++ b/libgfortran/generated/cshift0_i4.c @@ -47,7 +47,6 @@ cshift0_i4 (gfc_array_i4 *ret, const gfc_array_i4 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_i4 (gfc_array_i4 *ret, const gfc_array_i4 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_i4 (gfc_array_i4 *ret, const gfc_array_i4 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_i4 (gfc_array_i4 *ret, const gfc_array_i4 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_INTEGER_4); roffset = sizeof (GFC_INTEGER_4); soffset = sizeof (GFC_INTEGER_4); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_i8.c b/libgfortran/generated/cshift0_i8.c index b0230b777970..46228c2e26e5 100644 --- a/libgfortran/generated/cshift0_i8.c +++ b/libgfortran/generated/cshift0_i8.c @@ -47,7 +47,6 @@ cshift0_i8 (gfc_array_i8 *ret, const gfc_array_i8 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_i8 (gfc_array_i8 *ret, const gfc_array_i8 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_i8 (gfc_array_i8 *ret, const gfc_array_i8 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_i8 (gfc_array_i8 *ret, const gfc_array_i8 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_INTEGER_8); roffset = sizeof (GFC_INTEGER_8); soffset = sizeof (GFC_INTEGER_8); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_r10.c b/libgfortran/generated/cshift0_r10.c index e4a02140c61f..20d959ed3877 100644 --- a/libgfortran/generated/cshift0_r10.c +++ b/libgfortran/generated/cshift0_r10.c @@ -47,7 +47,6 @@ cshift0_r10 (gfc_array_r10 *ret, const gfc_array_r10 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_r10 (gfc_array_r10 *ret, const gfc_array_r10 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_r10 (gfc_array_r10 *ret, const gfc_array_r10 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_r10 (gfc_array_r10 *ret, const gfc_array_r10 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_REAL_10); roffset = sizeof (GFC_REAL_10); soffset = sizeof (GFC_REAL_10); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_r16.c b/libgfortran/generated/cshift0_r16.c index 5dd7678e6835..899ebe7dbdd0 100644 --- a/libgfortran/generated/cshift0_r16.c +++ b/libgfortran/generated/cshift0_r16.c @@ -47,7 +47,6 @@ cshift0_r16 (gfc_array_r16 *ret, const gfc_array_r16 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_r16 (gfc_array_r16 *ret, const gfc_array_r16 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_r16 (gfc_array_r16 *ret, const gfc_array_r16 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_r16 (gfc_array_r16 *ret, const gfc_array_r16 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_REAL_16); roffset = sizeof (GFC_REAL_16); soffset = sizeof (GFC_REAL_16); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_r17.c b/libgfortran/generated/cshift0_r17.c index 7df4915a7eaa..af2b5abfcd20 100644 --- a/libgfortran/generated/cshift0_r17.c +++ b/libgfortran/generated/cshift0_r17.c @@ -47,7 +47,6 @@ cshift0_r17 (gfc_array_r17 *ret, const gfc_array_r17 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_r17 (gfc_array_r17 *ret, const gfc_array_r17 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_r17 (gfc_array_r17 *ret, const gfc_array_r17 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_r17 (gfc_array_r17 *ret, const gfc_array_r17 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_REAL_17); roffset = sizeof (GFC_REAL_17); soffset = sizeof (GFC_REAL_17); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_r4.c b/libgfortran/generated/cshift0_r4.c index 975bd2057b77..b1de8af97d17 100644 --- a/libgfortran/generated/cshift0_r4.c +++ b/libgfortran/generated/cshift0_r4.c @@ -47,7 +47,6 @@ cshift0_r4 (gfc_array_r4 *ret, const gfc_array_r4 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_r4 (gfc_array_r4 *ret, const gfc_array_r4 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_r4 (gfc_array_r4 *ret, const gfc_array_r4 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_r4 (gfc_array_r4 *ret, const gfc_array_r4 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_REAL_4); roffset = sizeof (GFC_REAL_4); soffset = sizeof (GFC_REAL_4); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0; diff --git a/libgfortran/generated/cshift0_r8.c b/libgfortran/generated/cshift0_r8.c index 6503eba9ff79..51accae7cecc 100644 --- a/libgfortran/generated/cshift0_r8.c +++ b/libgfortran/generated/cshift0_r8.c @@ -47,7 +47,6 @@ cshift0_r8 (gfc_array_r8 *ret, const gfc_array_r8 *array, ptrdiff_t shift, index_type count[GFC_MAX_DIMENSIONS]; index_type extent[GFC_MAX_DIMENSIONS]; - index_type contiguous_extent; index_type dim; index_type len; index_type n; @@ -74,7 +73,6 @@ cshift0_r8 (gfc_array_r8 *ret, const gfc_array_r8 *array, ptrdiff_t shift, { /* Test if both ret and array are contiguous. */ do_blocked = true; - contiguous_extent = 1; dim = GFC_DESCRIPTOR_RANK (array); for (n = 0; n < dim; n ++) { @@ -91,10 +89,8 @@ cshift0_r8 (gfc_array_r8 *ret, const gfc_array_r8 *array, ptrdiff_t shift, do_blocked = false; break; } - index_type extent = GFC_DESCRIPTOR_EXTENT (array, n); r_ex *= GFC_DESCRIPTOR_EXTENT (ret, n); - a_ex *= extent; - contiguous_extent = extent; + a_ex *= GFC_DESCRIPTOR_EXTENT (array, n); } } else @@ -119,8 +115,9 @@ cshift0_r8 (gfc_array_r8 *ret, const gfc_array_r8 *array, ptrdiff_t shift, rstride[0] = sizeof (GFC_REAL_8); roffset = sizeof (GFC_REAL_8); soffset = sizeof (GFC_REAL_8); - len = contiguous_extent * GFC_DESCRIPTOR_EXTENT(array, which); - shift *= contiguous_extent; + index_type count_low = GFC_DESCRIPTOR_STRIDE(array, which); + len = count_low * GFC_DESCRIPTOR_EXTENT(array, which); + shift *= count_low; for (dim = which + 1; dim < GFC_DESCRIPTOR_RANK (array); dim++) { count[n] = 0;
