[gcc(refs/users/mikael/heads/refactor_descriptor_v05)] Correction régression {minloc,maxloc}_nan_1

[Mikael Morin via Gcc-cvs]

https://gcc.gnu.org/g:8bfeaef76d7af844952228c732947ad582794982

commit 8bfeaef76d7af844952228c732947ad582794982
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Sun May 18 16:47:43 2025 +0200

    Correction régression {minloc,maxloc}_nan_1

Diff:
---
 libgfortran/generated/maxloc0_16_i1.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_i16.c |  6 ++++++
 libgfortran/generated/maxloc0_16_i2.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_i4.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_i8.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_m1.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_m16.c |  6 ++++++
 libgfortran/generated/maxloc0_16_m2.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_m4.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_m8.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_r10.c |  6 ++++++
 libgfortran/generated/maxloc0_16_r16.c |  6 ++++++
 libgfortran/generated/maxloc0_16_r17.c |  6 ++++++
 libgfortran/generated/maxloc0_16_r4.c  |  6 ++++++
 libgfortran/generated/maxloc0_16_r8.c  |  6 ++++++
 libgfortran/generated/maxloc0_4_i1.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_i16.c  |  6 ++++++
 libgfortran/generated/maxloc0_4_i2.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_i4.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_i8.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_m1.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_m16.c  |  6 ++++++
 libgfortran/generated/maxloc0_4_m2.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_m4.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_m8.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_r10.c  |  6 ++++++
 libgfortran/generated/maxloc0_4_r16.c  |  6 ++++++
 libgfortran/generated/maxloc0_4_r17.c  |  6 ++++++
 libgfortran/generated/maxloc0_4_r4.c   |  6 ++++++
 libgfortran/generated/maxloc0_4_r8.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_i1.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_i16.c  |  6 ++++++
 libgfortran/generated/maxloc0_8_i2.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_i4.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_i8.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_m1.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_m16.c  |  6 ++++++
 libgfortran/generated/maxloc0_8_m2.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_m4.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_m8.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_r10.c  |  6 ++++++
 libgfortran/generated/maxloc0_8_r16.c  |  6 ++++++
 libgfortran/generated/maxloc0_8_r17.c  |  6 ++++++
 libgfortran/generated/maxloc0_8_r4.c   |  6 ++++++
 libgfortran/generated/maxloc0_8_r8.c   |  6 ++++++
 libgfortran/generated/minloc0_16_i1.c  |  6 ++++++
 libgfortran/generated/minloc0_16_i16.c |  6 ++++++
 libgfortran/generated/minloc0_16_i2.c  |  6 ++++++
 libgfortran/generated/minloc0_16_i4.c  |  6 ++++++
 libgfortran/generated/minloc0_16_i8.c  |  6 ++++++
 libgfortran/generated/minloc0_16_m1.c  |  6 ++++++
 libgfortran/generated/minloc0_16_m16.c |  6 ++++++
 libgfortran/generated/minloc0_16_m2.c  |  6 ++++++
 libgfortran/generated/minloc0_16_m4.c  |  6 ++++++
 libgfortran/generated/minloc0_16_m8.c  |  6 ++++++
 libgfortran/generated/minloc0_16_r10.c |  6 ++++++
 libgfortran/generated/minloc0_16_r16.c |  6 ++++++
 libgfortran/generated/minloc0_16_r17.c |  6 ++++++
 libgfortran/generated/minloc0_16_r4.c  |  6 ++++++
 libgfortran/generated/minloc0_16_r8.c  |  6 ++++++
 libgfortran/generated/minloc0_4_i1.c   |  6 ++++++
 libgfortran/generated/minloc0_4_i16.c  |  6 ++++++
 libgfortran/generated/minloc0_4_i2.c   |  6 ++++++
 libgfortran/generated/minloc0_4_i4.c   |  6 ++++++
 libgfortran/generated/minloc0_4_i8.c   |  6 ++++++
 libgfortran/generated/minloc0_4_m1.c   |  6 ++++++
 libgfortran/generated/minloc0_4_m16.c  |  6 ++++++
 libgfortran/generated/minloc0_4_m2.c   |  6 ++++++
 libgfortran/generated/minloc0_4_m4.c   |  6 ++++++
 libgfortran/generated/minloc0_4_m8.c   |  6 ++++++
 libgfortran/generated/minloc0_4_r10.c  |  6 ++++++
 libgfortran/generated/minloc0_4_r16.c  |  6 ++++++
 libgfortran/generated/minloc0_4_r17.c  |  6 ++++++
 libgfortran/generated/minloc0_4_r4.c   |  6 ++++++
 libgfortran/generated/minloc0_4_r8.c   |  6 ++++++
 libgfortran/generated/minloc0_8_i1.c   |  6 ++++++
 libgfortran/generated/minloc0_8_i16.c  |  6 ++++++
 libgfortran/generated/minloc0_8_i2.c   |  6 ++++++
 libgfortran/generated/minloc0_8_i4.c   |  6 ++++++
 libgfortran/generated/minloc0_8_i8.c   |  6 ++++++
 libgfortran/generated/minloc0_8_m1.c   |  6 ++++++
 libgfortran/generated/minloc0_8_m16.c  |  6 ++++++
 libgfortran/generated/minloc0_8_m2.c   |  6 ++++++
 libgfortran/generated/minloc0_8_m4.c   |  6 ++++++
 libgfortran/generated/minloc0_8_m8.c   |  6 ++++++
 libgfortran/generated/minloc0_8_r10.c  |  6 ++++++
 libgfortran/generated/minloc0_8_r16.c  |  6 ++++++
 libgfortran/generated/minloc0_8_r17.c  |  6 ++++++
 libgfortran/generated/minloc0_8_r4.c   |  6 ++++++
 libgfortran/generated/minloc0_8_r8.c   |  6 ++++++
 libgfortran/m4/iforeach.m4             | 12 +++++++++---
 91 files changed, 549 insertions(+), 3 deletions(-)

diff --git a/libgfortran/generated/maxloc0_16_i1.c 
b/libgfortran/generated/maxloc0_16_i1.c
index 537171998ed7..24baf8303708 100644
--- a/libgfortran/generated/maxloc0_16_i1.c
+++ b/libgfortran/generated/maxloc0_16_i1.c
@@ -55,6 +55,8 @@ maxloc0_16_i1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_i1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_i1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_i16.c 
b/libgfortran/generated/maxloc0_16_i16.c
index 0072e2927a6d..1d0e1c9c9d32 100644
--- a/libgfortran/generated/maxloc0_16_i16.c
+++ b/libgfortran/generated/maxloc0_16_i16.c
@@ -55,6 +55,8 @@ maxloc0_16_i16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_i16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_i16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_i2.c 
b/libgfortran/generated/maxloc0_16_i2.c
index 2e984feb7221..d489e46d219a 100644
--- a/libgfortran/generated/maxloc0_16_i2.c
+++ b/libgfortran/generated/maxloc0_16_i2.c
@@ -55,6 +55,8 @@ maxloc0_16_i2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_i2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_i2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_i4.c 
b/libgfortran/generated/maxloc0_16_i4.c
index b8673598d7cd..199483b9a165 100644
--- a/libgfortran/generated/maxloc0_16_i4.c
+++ b/libgfortran/generated/maxloc0_16_i4.c
@@ -55,6 +55,8 @@ maxloc0_16_i4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_i4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_i4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_i8.c 
b/libgfortran/generated/maxloc0_16_i8.c
index a3888b8d79f5..1fd9f8326977 100644
--- a/libgfortran/generated/maxloc0_16_i8.c
+++ b/libgfortran/generated/maxloc0_16_i8.c
@@ -55,6 +55,8 @@ maxloc0_16_i8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_i8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_i8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_m1.c 
b/libgfortran/generated/maxloc0_16_m1.c
index 93790b5cfcba..ec98b15fecbd 100644
--- a/libgfortran/generated/maxloc0_16_m1.c
+++ b/libgfortran/generated/maxloc0_16_m1.c
@@ -55,6 +55,8 @@ maxloc0_16_m1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_m1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_m1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_m16.c 
b/libgfortran/generated/maxloc0_16_m16.c
index a812c192495a..573b649f5e6b 100644
--- a/libgfortran/generated/maxloc0_16_m16.c
+++ b/libgfortran/generated/maxloc0_16_m16.c
@@ -55,6 +55,8 @@ maxloc0_16_m16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_m16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_m16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_m2.c 
b/libgfortran/generated/maxloc0_16_m2.c
index c980667767c0..8543e0d27bc8 100644
--- a/libgfortran/generated/maxloc0_16_m2.c
+++ b/libgfortran/generated/maxloc0_16_m2.c
@@ -55,6 +55,8 @@ maxloc0_16_m2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_m2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_m2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_m4.c 
b/libgfortran/generated/maxloc0_16_m4.c
index 62f074f1b252..bf941ee59de8 100644
--- a/libgfortran/generated/maxloc0_16_m4.c
+++ b/libgfortran/generated/maxloc0_16_m4.c
@@ -55,6 +55,8 @@ maxloc0_16_m4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_m4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_m4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_m8.c 
b/libgfortran/generated/maxloc0_16_m8.c
index 03294dc05c9a..024ed9a01023 100644
--- a/libgfortran/generated/maxloc0_16_m8.c
+++ b/libgfortran/generated/maxloc0_16_m8.c
@@ -55,6 +55,8 @@ maxloc0_16_m8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_m8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_m8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_r10.c 
b/libgfortran/generated/maxloc0_16_r10.c
index 2ed7d58adb4c..39ad6371520a 100644
--- a/libgfortran/generated/maxloc0_16_r10.c
+++ b/libgfortran/generated/maxloc0_16_r10.c
@@ -55,6 +55,8 @@ maxloc0_16_r10 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_r10 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_r10 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_r16.c 
b/libgfortran/generated/maxloc0_16_r16.c
index c81f8785d24c..cd61901fb954 100644
--- a/libgfortran/generated/maxloc0_16_r16.c
+++ b/libgfortran/generated/maxloc0_16_r16.c
@@ -55,6 +55,8 @@ maxloc0_16_r16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_r16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_r16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_r17.c 
b/libgfortran/generated/maxloc0_16_r17.c
index e96edb695c80..1ecccd4ac1d0 100644
--- a/libgfortran/generated/maxloc0_16_r17.c
+++ b/libgfortran/generated/maxloc0_16_r17.c
@@ -55,6 +55,8 @@ maxloc0_16_r17 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_r17 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_r17 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_r4.c 
b/libgfortran/generated/maxloc0_16_r4.c
index 0fb9709e45ad..a5966dda574a 100644
--- a/libgfortran/generated/maxloc0_16_r4.c
+++ b/libgfortran/generated/maxloc0_16_r4.c
@@ -55,6 +55,8 @@ maxloc0_16_r4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_r4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_r4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_16_r8.c 
b/libgfortran/generated/maxloc0_16_r8.c
index e9413b0b1f01..79eaffb56a81 100644
--- a/libgfortran/generated/maxloc0_16_r8.c
+++ b/libgfortran/generated/maxloc0_16_r8.c
@@ -55,6 +55,8 @@ maxloc0_16_r8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mmaxloc0_16_r8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -391,6 +395,8 @@ smaxloc0_16_r8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/maxloc0_4_i1.c 
b/libgfortran/generated/maxloc0_4_i1.c
index 3d232d309955..0a6a142bc0a2 100644
--- a/libgfortran/generated/maxloc0_4_i1.c
+++ b/libgfortran/generated/maxloc0_4_i1.c
@@ -55,6 +55,8 @@ maxloc0_4_i1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_i1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_i1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_i16.c 
b/libgfortran/generated/maxloc0_4_i16.c
index e4ed5e8f1e41..8ebc1c6bdad8 100644
--- a/libgfortran/generated/maxloc0_4_i16.c
+++ b/libgfortran/generated/maxloc0_4_i16.c
@@ -55,6 +55,8 @@ maxloc0_4_i16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_i16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_i16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_i2.c 
b/libgfortran/generated/maxloc0_4_i2.c
index 0d742a9a9fb8..68feb8272b7a 100644
--- a/libgfortran/generated/maxloc0_4_i2.c
+++ b/libgfortran/generated/maxloc0_4_i2.c
@@ -55,6 +55,8 @@ maxloc0_4_i2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_i2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_i2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_i4.c 
b/libgfortran/generated/maxloc0_4_i4.c
index e7e99d61d337..36c41ec30880 100644
--- a/libgfortran/generated/maxloc0_4_i4.c
+++ b/libgfortran/generated/maxloc0_4_i4.c
@@ -55,6 +55,8 @@ maxloc0_4_i4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_i4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_i4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_i8.c 
b/libgfortran/generated/maxloc0_4_i8.c
index 45e6ab06d819..c9d16070bbed 100644
--- a/libgfortran/generated/maxloc0_4_i8.c
+++ b/libgfortran/generated/maxloc0_4_i8.c
@@ -55,6 +55,8 @@ maxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_m1.c 
b/libgfortran/generated/maxloc0_4_m1.c
index df1f38265ee9..213b8497592f 100644
--- a/libgfortran/generated/maxloc0_4_m1.c
+++ b/libgfortran/generated/maxloc0_4_m1.c
@@ -55,6 +55,8 @@ maxloc0_4_m1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_m1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_m1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_m16.c 
b/libgfortran/generated/maxloc0_4_m16.c
index 38f0ca6f0610..be46a2292d9a 100644
--- a/libgfortran/generated/maxloc0_4_m16.c
+++ b/libgfortran/generated/maxloc0_4_m16.c
@@ -55,6 +55,8 @@ maxloc0_4_m16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_m16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_m16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_m2.c 
b/libgfortran/generated/maxloc0_4_m2.c
index d619bc2c014d..af879f1f0b9d 100644
--- a/libgfortran/generated/maxloc0_4_m2.c
+++ b/libgfortran/generated/maxloc0_4_m2.c
@@ -55,6 +55,8 @@ maxloc0_4_m2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_m2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_m2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_m4.c 
b/libgfortran/generated/maxloc0_4_m4.c
index b31c04c3d7b4..7d3fcd24bf51 100644
--- a/libgfortran/generated/maxloc0_4_m4.c
+++ b/libgfortran/generated/maxloc0_4_m4.c
@@ -55,6 +55,8 @@ maxloc0_4_m4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_m4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_m4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_m8.c 
b/libgfortran/generated/maxloc0_4_m8.c
index a8f11d46d75d..8220b8f5864e 100644
--- a/libgfortran/generated/maxloc0_4_m8.c
+++ b/libgfortran/generated/maxloc0_4_m8.c
@@ -55,6 +55,8 @@ maxloc0_4_m8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_m8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_m8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_r10.c 
b/libgfortran/generated/maxloc0_4_r10.c
index bca369aa34c4..2102406460c3 100644
--- a/libgfortran/generated/maxloc0_4_r10.c
+++ b/libgfortran/generated/maxloc0_4_r10.c
@@ -55,6 +55,8 @@ maxloc0_4_r10 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_r10 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_r10 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_r16.c 
b/libgfortran/generated/maxloc0_4_r16.c
index e84fff7e1462..6a8af1e9be88 100644
--- a/libgfortran/generated/maxloc0_4_r16.c
+++ b/libgfortran/generated/maxloc0_4_r16.c
@@ -55,6 +55,8 @@ maxloc0_4_r16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_r16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_r16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_r17.c 
b/libgfortran/generated/maxloc0_4_r17.c
index 73d410bca1e4..151d56a509ed 100644
--- a/libgfortran/generated/maxloc0_4_r17.c
+++ b/libgfortran/generated/maxloc0_4_r17.c
@@ -55,6 +55,8 @@ maxloc0_4_r17 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_r17 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_r17 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_r4.c 
b/libgfortran/generated/maxloc0_4_r4.c
index f620238d3152..d8d8f3882190 100644
--- a/libgfortran/generated/maxloc0_4_r4.c
+++ b/libgfortran/generated/maxloc0_4_r4.c
@@ -55,6 +55,8 @@ maxloc0_4_r4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_r4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_r4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_4_r8.c 
b/libgfortran/generated/maxloc0_4_r8.c
index 945900b942c1..bdff79e2e917 100644
--- a/libgfortran/generated/maxloc0_4_r8.c
+++ b/libgfortran/generated/maxloc0_4_r8.c
@@ -55,6 +55,8 @@ maxloc0_4_r8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mmaxloc0_4_r8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -391,6 +395,8 @@ smaxloc0_4_r8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/maxloc0_8_i1.c 
b/libgfortran/generated/maxloc0_8_i1.c
index f480929ea0c8..343d42913c55 100644
--- a/libgfortran/generated/maxloc0_8_i1.c
+++ b/libgfortran/generated/maxloc0_8_i1.c
@@ -55,6 +55,8 @@ maxloc0_8_i1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_i1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_i1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_i16.c 
b/libgfortran/generated/maxloc0_8_i16.c
index b315a0d2f51b..3cdbd9a281f3 100644
--- a/libgfortran/generated/maxloc0_8_i16.c
+++ b/libgfortran/generated/maxloc0_8_i16.c
@@ -55,6 +55,8 @@ maxloc0_8_i16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_i16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_i16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_i2.c 
b/libgfortran/generated/maxloc0_8_i2.c
index 729648c2eb0c..d182db67fc10 100644
--- a/libgfortran/generated/maxloc0_8_i2.c
+++ b/libgfortran/generated/maxloc0_8_i2.c
@@ -55,6 +55,8 @@ maxloc0_8_i2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_i2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_i2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_i4.c 
b/libgfortran/generated/maxloc0_8_i4.c
index 056167f08e91..6e619b23966f 100644
--- a/libgfortran/generated/maxloc0_8_i4.c
+++ b/libgfortran/generated/maxloc0_8_i4.c
@@ -55,6 +55,8 @@ maxloc0_8_i4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_i4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_i4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_i8.c 
b/libgfortran/generated/maxloc0_8_i8.c
index 28c543e4ccfe..3e08e2d4cf77 100644
--- a/libgfortran/generated/maxloc0_8_i8.c
+++ b/libgfortran/generated/maxloc0_8_i8.c
@@ -55,6 +55,8 @@ maxloc0_8_i8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_i8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_i8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_m1.c 
b/libgfortran/generated/maxloc0_8_m1.c
index 1e947bfe5860..b4c34f43800d 100644
--- a/libgfortran/generated/maxloc0_8_m1.c
+++ b/libgfortran/generated/maxloc0_8_m1.c
@@ -55,6 +55,8 @@ maxloc0_8_m1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_m1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_m1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_m16.c 
b/libgfortran/generated/maxloc0_8_m16.c
index 8b3170e8573a..5b05252f36a7 100644
--- a/libgfortran/generated/maxloc0_8_m16.c
+++ b/libgfortran/generated/maxloc0_8_m16.c
@@ -55,6 +55,8 @@ maxloc0_8_m16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_m16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_m16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_m2.c 
b/libgfortran/generated/maxloc0_8_m2.c
index ead19c21f9d5..0884c90b6a31 100644
--- a/libgfortran/generated/maxloc0_8_m2.c
+++ b/libgfortran/generated/maxloc0_8_m2.c
@@ -55,6 +55,8 @@ maxloc0_8_m2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_m2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_m2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_m4.c 
b/libgfortran/generated/maxloc0_8_m4.c
index 7b8446e1e3f1..edbcd0ef4871 100644
--- a/libgfortran/generated/maxloc0_8_m4.c
+++ b/libgfortran/generated/maxloc0_8_m4.c
@@ -55,6 +55,8 @@ maxloc0_8_m4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_m4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_m4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_m8.c 
b/libgfortran/generated/maxloc0_8_m8.c
index be15172c3a0a..b13376add6a6 100644
--- a/libgfortran/generated/maxloc0_8_m8.c
+++ b/libgfortran/generated/maxloc0_8_m8.c
@@ -55,6 +55,8 @@ maxloc0_8_m8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_m8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_m8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_r10.c 
b/libgfortran/generated/maxloc0_8_r10.c
index e48ee5f3e696..15ed96baa4b2 100644
--- a/libgfortran/generated/maxloc0_8_r10.c
+++ b/libgfortran/generated/maxloc0_8_r10.c
@@ -55,6 +55,8 @@ maxloc0_8_r10 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_r10 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_r10 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_r16.c 
b/libgfortran/generated/maxloc0_8_r16.c
index c769778b34cc..bd5a9f54d3c0 100644
--- a/libgfortran/generated/maxloc0_8_r16.c
+++ b/libgfortran/generated/maxloc0_8_r16.c
@@ -55,6 +55,8 @@ maxloc0_8_r16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_r16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_r16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_r17.c 
b/libgfortran/generated/maxloc0_8_r17.c
index 7ad3a2c0a255..6a83757cc104 100644
--- a/libgfortran/generated/maxloc0_8_r17.c
+++ b/libgfortran/generated/maxloc0_8_r17.c
@@ -55,6 +55,8 @@ maxloc0_8_r17 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_r17 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_r17 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_r4.c 
b/libgfortran/generated/maxloc0_8_r4.c
index 7d17434fe711..cf987651e9ba 100644
--- a/libgfortran/generated/maxloc0_8_r4.c
+++ b/libgfortran/generated/maxloc0_8_r4.c
@@ -55,6 +55,8 @@ maxloc0_8_r4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_r4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_r4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/maxloc0_8_r8.c 
b/libgfortran/generated/maxloc0_8_r8.c
index 6530881b0b5d..142a1550dacc 100644
--- a/libgfortran/generated/maxloc0_8_r8.c
+++ b/libgfortran/generated/maxloc0_8_r8.c
@@ -55,6 +55,8 @@ maxloc0_8_r8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mmaxloc0_8_r8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -391,6 +395,8 @@ smaxloc0_8_r8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_16_i1.c 
b/libgfortran/generated/minloc0_16_i1.c
index 2ba955c51ab1..0a5aa025771a 100644
--- a/libgfortran/generated/minloc0_16_i1.c
+++ b/libgfortran/generated/minloc0_16_i1.c
@@ -55,6 +55,8 @@ minloc0_16_i1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_i1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_i1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_i16.c 
b/libgfortran/generated/minloc0_16_i16.c
index 1624cc8ea48b..393b1977c67f 100644
--- a/libgfortran/generated/minloc0_16_i16.c
+++ b/libgfortran/generated/minloc0_16_i16.c
@@ -55,6 +55,8 @@ minloc0_16_i16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_i16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_i16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_i2.c 
b/libgfortran/generated/minloc0_16_i2.c
index 473bf99e70e5..5b4c006f3a3c 100644
--- a/libgfortran/generated/minloc0_16_i2.c
+++ b/libgfortran/generated/minloc0_16_i2.c
@@ -55,6 +55,8 @@ minloc0_16_i2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_i2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_i2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_i4.c 
b/libgfortran/generated/minloc0_16_i4.c
index 2cc56a638219..e1a65c9a2143 100644
--- a/libgfortran/generated/minloc0_16_i4.c
+++ b/libgfortran/generated/minloc0_16_i4.c
@@ -55,6 +55,8 @@ minloc0_16_i4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_i4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_i4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_i8.c 
b/libgfortran/generated/minloc0_16_i8.c
index 79aed5aa6173..7c6067070522 100644
--- a/libgfortran/generated/minloc0_16_i8.c
+++ b/libgfortran/generated/minloc0_16_i8.c
@@ -55,6 +55,8 @@ minloc0_16_i8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_i8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_i8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_m1.c 
b/libgfortran/generated/minloc0_16_m1.c
index fece30079eb7..74c00e28715c 100644
--- a/libgfortran/generated/minloc0_16_m1.c
+++ b/libgfortran/generated/minloc0_16_m1.c
@@ -55,6 +55,8 @@ minloc0_16_m1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_m1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_m1 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_m16.c 
b/libgfortran/generated/minloc0_16_m16.c
index 832abb532bdf..ab96f98b2de4 100644
--- a/libgfortran/generated/minloc0_16_m16.c
+++ b/libgfortran/generated/minloc0_16_m16.c
@@ -55,6 +55,8 @@ minloc0_16_m16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_m16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_m16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_m2.c 
b/libgfortran/generated/minloc0_16_m2.c
index ae444e97cebd..4902c1f57fb7 100644
--- a/libgfortran/generated/minloc0_16_m2.c
+++ b/libgfortran/generated/minloc0_16_m2.c
@@ -55,6 +55,8 @@ minloc0_16_m2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_m2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_m2 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_m4.c 
b/libgfortran/generated/minloc0_16_m4.c
index cba10cbdcfaa..25dc17469545 100644
--- a/libgfortran/generated/minloc0_16_m4.c
+++ b/libgfortran/generated/minloc0_16_m4.c
@@ -55,6 +55,8 @@ minloc0_16_m4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_m4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_m4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_m8.c 
b/libgfortran/generated/minloc0_16_m8.c
index e37936bfe6eb..3513c1ae4e9a 100644
--- a/libgfortran/generated/minloc0_16_m8.c
+++ b/libgfortran/generated/minloc0_16_m8.c
@@ -55,6 +55,8 @@ minloc0_16_m8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_m8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_m8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_r10.c 
b/libgfortran/generated/minloc0_16_r10.c
index 37ace9e38f95..0fad9eb920b2 100644
--- a/libgfortran/generated/minloc0_16_r10.c
+++ b/libgfortran/generated/minloc0_16_r10.c
@@ -55,6 +55,8 @@ minloc0_16_r10 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_r10 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_r10 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_r16.c 
b/libgfortran/generated/minloc0_16_r16.c
index 33b24bb515a3..86d464721c4f 100644
--- a/libgfortran/generated/minloc0_16_r16.c
+++ b/libgfortran/generated/minloc0_16_r16.c
@@ -55,6 +55,8 @@ minloc0_16_r16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_r16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_r16 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_r17.c 
b/libgfortran/generated/minloc0_16_r17.c
index f9d6e923f13d..bd932e6f359d 100644
--- a/libgfortran/generated/minloc0_16_r17.c
+++ b/libgfortran/generated/minloc0_16_r17.c
@@ -55,6 +55,8 @@ minloc0_16_r17 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_r17 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_r17 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_r4.c 
b/libgfortran/generated/minloc0_16_r4.c
index 43fc571b3117..0b46aebb73cf 100644
--- a/libgfortran/generated/minloc0_16_r4.c
+++ b/libgfortran/generated/minloc0_16_r4.c
@@ -55,6 +55,8 @@ minloc0_16_r4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_r4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_r4 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_16_r8.c 
b/libgfortran/generated/minloc0_16_r8.c
index 0b1220da2e31..2a04bd075ad5 100644
--- a/libgfortran/generated/minloc0_16_r8.c
+++ b/libgfortran/generated/minloc0_16_r8.c
@@ -55,6 +55,8 @@ minloc0_16_r8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -213,6 +215,8 @@ mminloc0_16_r8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
@@ -390,6 +394,8 @@ sminloc0_16_r8 (gfc_array_i16 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_16));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_16);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_16);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_16));
     }
diff --git a/libgfortran/generated/minloc0_4_i1.c 
b/libgfortran/generated/minloc0_4_i1.c
index eb81163f3e6a..b0a9416b8452 100644
--- a/libgfortran/generated/minloc0_4_i1.c
+++ b/libgfortran/generated/minloc0_4_i1.c
@@ -55,6 +55,8 @@ minloc0_4_i1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_i1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_i1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_i16.c 
b/libgfortran/generated/minloc0_4_i16.c
index 80610eea0ec9..2a708b1b4a95 100644
--- a/libgfortran/generated/minloc0_4_i16.c
+++ b/libgfortran/generated/minloc0_4_i16.c
@@ -55,6 +55,8 @@ minloc0_4_i16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_i16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_i16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_i2.c 
b/libgfortran/generated/minloc0_4_i2.c
index 5c849456e680..611144804ea0 100644
--- a/libgfortran/generated/minloc0_4_i2.c
+++ b/libgfortran/generated/minloc0_4_i2.c
@@ -55,6 +55,8 @@ minloc0_4_i2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_i2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_i2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_i4.c 
b/libgfortran/generated/minloc0_4_i4.c
index 9675ca67f303..dd97c388aa8e 100644
--- a/libgfortran/generated/minloc0_4_i4.c
+++ b/libgfortran/generated/minloc0_4_i4.c
@@ -55,6 +55,8 @@ minloc0_4_i4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_i4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_i4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_i8.c 
b/libgfortran/generated/minloc0_4_i8.c
index 7f4d0986e24c..d15e14a2e785 100644
--- a/libgfortran/generated/minloc0_4_i8.c
+++ b/libgfortran/generated/minloc0_4_i8.c
@@ -55,6 +55,8 @@ minloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_m1.c 
b/libgfortran/generated/minloc0_4_m1.c
index e65686a1fee4..7898feda8dee 100644
--- a/libgfortran/generated/minloc0_4_m1.c
+++ b/libgfortran/generated/minloc0_4_m1.c
@@ -55,6 +55,8 @@ minloc0_4_m1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_m1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_m1 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_m16.c 
b/libgfortran/generated/minloc0_4_m16.c
index 79565fc902a5..d6ae51ec79a6 100644
--- a/libgfortran/generated/minloc0_4_m16.c
+++ b/libgfortran/generated/minloc0_4_m16.c
@@ -55,6 +55,8 @@ minloc0_4_m16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_m16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_m16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_m2.c 
b/libgfortran/generated/minloc0_4_m2.c
index 2f61412d8a21..61910bca5c1f 100644
--- a/libgfortran/generated/minloc0_4_m2.c
+++ b/libgfortran/generated/minloc0_4_m2.c
@@ -55,6 +55,8 @@ minloc0_4_m2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_m2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_m2 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_m4.c 
b/libgfortran/generated/minloc0_4_m4.c
index 9f532cd3dd2b..46547b72ac50 100644
--- a/libgfortran/generated/minloc0_4_m4.c
+++ b/libgfortran/generated/minloc0_4_m4.c
@@ -55,6 +55,8 @@ minloc0_4_m4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_m4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_m4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_m8.c 
b/libgfortran/generated/minloc0_4_m8.c
index 26465c90441d..7cac54254a9e 100644
--- a/libgfortran/generated/minloc0_4_m8.c
+++ b/libgfortran/generated/minloc0_4_m8.c
@@ -55,6 +55,8 @@ minloc0_4_m8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_m8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_m8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_r10.c 
b/libgfortran/generated/minloc0_4_r10.c
index c4b1c63ed09a..1a46798add64 100644
--- a/libgfortran/generated/minloc0_4_r10.c
+++ b/libgfortran/generated/minloc0_4_r10.c
@@ -55,6 +55,8 @@ minloc0_4_r10 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_r10 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_r10 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_r16.c 
b/libgfortran/generated/minloc0_4_r16.c
index f73d4209268a..0c3ae97944e8 100644
--- a/libgfortran/generated/minloc0_4_r16.c
+++ b/libgfortran/generated/minloc0_4_r16.c
@@ -55,6 +55,8 @@ minloc0_4_r16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_r16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_r16 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_r17.c 
b/libgfortran/generated/minloc0_4_r17.c
index 88d93cdb84d3..69ba16a583c2 100644
--- a/libgfortran/generated/minloc0_4_r17.c
+++ b/libgfortran/generated/minloc0_4_r17.c
@@ -55,6 +55,8 @@ minloc0_4_r17 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_r17 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_r17 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_r4.c 
b/libgfortran/generated/minloc0_4_r4.c
index 37133351cfa5..1c4a4abad44e 100644
--- a/libgfortran/generated/minloc0_4_r4.c
+++ b/libgfortran/generated/minloc0_4_r4.c
@@ -55,6 +55,8 @@ minloc0_4_r4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_r4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_r4 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_4_r8.c 
b/libgfortran/generated/minloc0_4_r8.c
index 126ec1b5b7d6..c36005580ea8 100644
--- a/libgfortran/generated/minloc0_4_r8.c
+++ b/libgfortran/generated/minloc0_4_r8.c
@@ -55,6 +55,8 @@ minloc0_4_r8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -213,6 +215,8 @@ mminloc0_4_r8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
@@ -390,6 +394,8 @@ sminloc0_4_r8 (gfc_array_i4 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_4));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_4);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_4);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_4));
     }
diff --git a/libgfortran/generated/minloc0_8_i1.c 
b/libgfortran/generated/minloc0_8_i1.c
index 0bea5d39fcdd..61e45a05a4c1 100644
--- a/libgfortran/generated/minloc0_8_i1.c
+++ b/libgfortran/generated/minloc0_8_i1.c
@@ -55,6 +55,8 @@ minloc0_8_i1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_i1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_i1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_i16.c 
b/libgfortran/generated/minloc0_8_i16.c
index 1cb45e2cfc9e..d07a58d8d66d 100644
--- a/libgfortran/generated/minloc0_8_i16.c
+++ b/libgfortran/generated/minloc0_8_i16.c
@@ -55,6 +55,8 @@ minloc0_8_i16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_i16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_i16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_i2.c 
b/libgfortran/generated/minloc0_8_i2.c
index 6b539710bc6d..c3544c1718cb 100644
--- a/libgfortran/generated/minloc0_8_i2.c
+++ b/libgfortran/generated/minloc0_8_i2.c
@@ -55,6 +55,8 @@ minloc0_8_i2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_i2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_i2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_i4.c 
b/libgfortran/generated/minloc0_8_i4.c
index d166e7e8ef93..1799791c6fae 100644
--- a/libgfortran/generated/minloc0_8_i4.c
+++ b/libgfortran/generated/minloc0_8_i4.c
@@ -55,6 +55,8 @@ minloc0_8_i4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_i4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_i4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_i8.c 
b/libgfortran/generated/minloc0_8_i8.c
index 48862098b461..f3e29b53915f 100644
--- a/libgfortran/generated/minloc0_8_i8.c
+++ b/libgfortran/generated/minloc0_8_i8.c
@@ -55,6 +55,8 @@ minloc0_8_i8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_i8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_i8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_m1.c 
b/libgfortran/generated/minloc0_8_m1.c
index 8630dbd10262..a8cdaf1276ce 100644
--- a/libgfortran/generated/minloc0_8_m1.c
+++ b/libgfortran/generated/minloc0_8_m1.c
@@ -55,6 +55,8 @@ minloc0_8_m1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_m1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_m1 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_m16.c 
b/libgfortran/generated/minloc0_8_m16.c
index 27db4e0cf658..e8413c0cf380 100644
--- a/libgfortran/generated/minloc0_8_m16.c
+++ b/libgfortran/generated/minloc0_8_m16.c
@@ -55,6 +55,8 @@ minloc0_8_m16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_m16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_m16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_m2.c 
b/libgfortran/generated/minloc0_8_m2.c
index d477c81cdf10..96a1d56a49b5 100644
--- a/libgfortran/generated/minloc0_8_m2.c
+++ b/libgfortran/generated/minloc0_8_m2.c
@@ -55,6 +55,8 @@ minloc0_8_m2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_m2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_m2 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_m4.c 
b/libgfortran/generated/minloc0_8_m4.c
index 6a1ea53fc821..50b003767eac 100644
--- a/libgfortran/generated/minloc0_8_m4.c
+++ b/libgfortran/generated/minloc0_8_m4.c
@@ -55,6 +55,8 @@ minloc0_8_m4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_m4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_m4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_m8.c 
b/libgfortran/generated/minloc0_8_m8.c
index 005ed0977e1d..34cd023e252c 100644
--- a/libgfortran/generated/minloc0_8_m8.c
+++ b/libgfortran/generated/minloc0_8_m8.c
@@ -55,6 +55,8 @@ minloc0_8_m8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_m8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_m8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_r10.c 
b/libgfortran/generated/minloc0_8_r10.c
index e929968a447a..e38260805131 100644
--- a/libgfortran/generated/minloc0_8_r10.c
+++ b/libgfortran/generated/minloc0_8_r10.c
@@ -55,6 +55,8 @@ minloc0_8_r10 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_r10 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_r10 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_r16.c 
b/libgfortran/generated/minloc0_8_r16.c
index 20b9204e86d8..4d43bcf29568 100644
--- a/libgfortran/generated/minloc0_8_r16.c
+++ b/libgfortran/generated/minloc0_8_r16.c
@@ -55,6 +55,8 @@ minloc0_8_r16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_r16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_r16 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_r17.c 
b/libgfortran/generated/minloc0_8_r17.c
index 8842d7893623..ddc250589600 100644
--- a/libgfortran/generated/minloc0_8_r17.c
+++ b/libgfortran/generated/minloc0_8_r17.c
@@ -55,6 +55,8 @@ minloc0_8_r17 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_r17 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_r17 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_r4.c 
b/libgfortran/generated/minloc0_8_r4.c
index 9fb02c2ee1b9..67e16925aea9 100644
--- a/libgfortran/generated/minloc0_8_r4.c
+++ b/libgfortran/generated/minloc0_8_r4.c
@@ -55,6 +55,8 @@ minloc0_8_r4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_r4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_r4 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/generated/minloc0_8_r8.c 
b/libgfortran/generated/minloc0_8_r8.c
index d29037c28766..6a9ecb28a833 100644
--- a/libgfortran/generated/minloc0_8_r8.c
+++ b/libgfortran/generated/minloc0_8_r8.c
@@ -55,6 +55,8 @@ minloc0_8_r8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -213,6 +215,8 @@ mminloc0_8_r8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, sizeof 
(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
@@ -390,6 +394,8 @@ sminloc0_8_r8 (gfc_array_i8 * const restrict retarray,
     {
       GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 
sizeof(GFC_INTEGER_8));
       retarray->dtype.rank = 1;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof (GFC_INTEGER_8);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof (GFC_INTEGER_8);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_8));
     }
diff --git a/libgfortran/m4/iforeach.m4 b/libgfortran/m4/iforeach.m4
index 499f984734bd..df950abce8a1 100644
--- a/libgfortran/m4/iforeach.m4
+++ b/libgfortran/m4/iforeach.m4
@@ -27,8 +27,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;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof ('rtype_name`);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof ('rtype_name`);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (rtype_name));
     }
@@ -136,8 +138,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;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof ('rtype_name`);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof ('rtype_name`);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (rtype_name));
     }
@@ -267,8 +271,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;
+      GFC_DESCRIPTOR_SIZE (retarray) = sizeof ('rtype_name`);
+      GFC_DESCRIPTOR_SPAN (retarray) = sizeof ('rtype_name`);
       retarray->offset = 0;
       retarray->base_addr = xmallocarray (rank, sizeof (rtype_name));
     }