2012-10-28 Tobias Burnus <burnus@net-b.de>

         * m4/bessel.m4: Remove useless statement.
         * m4/ifunction.m4: Remove unreachable code.
         * generated/bessel_r10.c: Regenerated.
         * generated/bessel_r16.c: Regenerated.
         * generated/bessel_r4.c: Regenerated.
         * generated/bessel_r8.c: Regenerated.
         * generated/iall_i1.c: Regenerated.
         * generated/iall_i16.c: Regenerated.
         * generated/iall_i2.c: Regenerated.
         * generated/iall_i4.c: Regenerated.
         * generated/iall_i8.c: Regenerated.
         * generated/iany_i1.c: Regenerated.
         * generated/iany_i16.c: Regenerated.
         * generated/iany_i2.c: Regenerated.
         * generated/iany_i4.c: Regenerated.
         * generated/iany_i8.c: Regenerated.
         * generated/iparity_i1.c: Regenerated.
         * generated/iparity_i16.c: Regenerated.
         * generated/iparity_i2.c: Regenerated.
         * generated/iparity_i4.c: Regenerated.
         * generated/iparity_i8.c: Regenerated.
         * generated/maxloc1_16_i1.c: Regenerated.
         * generated/maxloc1_16_i16.c: Regenerated.
         * generated/maxloc1_16_i2.c: Regenerated.
         * generated/maxloc1_16_i4.c: Regenerated.
         * generated/maxloc1_16_i8.c: Regenerated.
         * generated/maxloc1_16_r10.c: Regenerated.
         * generated/maxloc1_16_r16.c: Regenerated.
         * generated/maxloc1_16_r4.c: Regenerated.
         * generated/maxloc1_16_r8.c: Regenerated.
         * generated/maxloc1_4_i1.c: Regenerated.
         * generated/maxloc1_4_i16.c: Regenerated.
         * generated/maxloc1_4_i2.c: Regenerated.
         * generated/maxloc1_4_i4.c: Regenerated.
         * generated/maxloc1_4_i8.c: Regenerated.
         * generated/maxloc1_4_r10.c: Regenerated.
         * generated/maxloc1_4_r16.c: Regenerated.
         * generated/maxloc1_4_r4.c: Regenerated.
         * generated/maxloc1_4_r8.c: Regenerated.
         * generated/maxloc1_8_i1.c: Regenerated.
         * generated/maxloc1_8_i16.c: Regenerated.
         * generated/maxloc1_8_i2.c: Regenerated.
         * generated/maxloc1_8_i4.c: Regenerated.
         * generated/maxloc1_8_i8.c: Regenerated.
         * generated/maxloc1_8_r10.c: Regenerated.
         * generated/maxloc1_8_r16.c: Regenerated.
         * generated/maxloc1_8_r4.c: Regenerated.
         * generated/maxloc1_8_r8.c: Regenerated.
         * generated/maxval_i1.c: Regenerated.
         * generated/maxval_i16.c: Regenerated.
         * generated/maxval_i2.c: Regenerated.
         * generated/maxval_i4.c: Regenerated.
         * generated/maxval_i8.c: Regenerated.
         * generated/maxval_r10.c: Regenerated.
         * generated/maxval_r16.c: Regenerated.
         * generated/maxval_r4.c: Regenerated.
         * generated/maxval_r8.c: Regenerated.
         * generated/minloc1_16_i1.c: Regenerated.
         * generated/minloc1_16_i16.c: Regenerated.
         * generated/minloc1_16_i2.c: Regenerated.
         * generated/minloc1_16_i4.c: Regenerated.
         * generated/minloc1_16_i8.c: Regenerated.
         * generated/minloc1_16_r10.c: Regenerated.
         * generated/minloc1_16_r16.c: Regenerated.
         * generated/minloc1_16_r4.c: Regenerated.
         * generated/minloc1_16_r8.c: Regenerated.
         * generated/minloc1_4_i1.c: Regenerated.
         * generated/minloc1_4_i16.c: Regenerated.
         * generated/minloc1_4_i2.c: Regenerated.
         * generated/minloc1_4_i4.c: Regenerated.
         * generated/minloc1_4_i8.c: Regenerated.
         * generated/minloc1_4_r10.c: Regenerated.
         * generated/minloc1_4_r16.c: Regenerated.
         * generated/minloc1_4_r4.c: Regenerated.
         * generated/minloc1_4_r8.c: Regenerated.
         * generated/minloc1_8_i1.c: Regenerated.
         * generated/minloc1_8_i16.c: Regenerated.
         * generated/minloc1_8_i2.c: Regenerated.
         * generated/minloc1_8_i4.c: Regenerated.
         * generated/minloc1_8_i8.c: Regenerated.
         * generated/minloc1_8_r10.c: Regenerated.
         * generated/minloc1_8_r16.c: Regenerated.
         * generated/minloc1_8_r4.c: Regenerated.
         * generated/minloc1_8_r8.c: Regenerated.
         * generated/minval_i1.c: Regenerated.
         * generated/minval_i16.c: Regenerated.
         * generated/minval_i2.c: Regenerated.
         * generated/minval_i4.c: Regenerated.
         * generated/minval_i8.c: Regenerated.
         * generated/minval_r10.c: Regenerated.
         * generated/minval_r16.c: Regenerated.
         * generated/minval_r4.c: Regenerated.
         * generated/minval_r8.c: Regenerated.
         * generated/product_c10.c: Regenerated.
         * generated/product_c16.c: Regenerated.
         * generated/product_c4.c: Regenerated.
         * generated/product_c8.c: Regenerated.
         * generated/product_i1.c: Regenerated.
         * generated/product_i16.c: Regenerated.
         * generated/product_i2.c: Regenerated.
         * generated/product_i4.c: Regenerated.
         * generated/product_i8.c: Regenerated.
         * generated/product_r10.c: Regenerated.
         * generated/product_r16.c: Regenerated.
         * generated/product_r4.c: Regenerated.
         * generated/product_r8.c: Regenerated.
         * generated/sum_c10.c: Regenerated.
         * generated/sum_c16.c: Regenerated.
         * generated/sum_c4.c: Regenerated.
         * generated/sum_c8.c: Regenerated.
         * generated/sum_i1.c: Regenerated.
         * generated/sum_i16.c: Regenerated.
         * generated/sum_i2.c: Regenerated.
         * generated/sum_i4.c: Regenerated.
         * generated/sum_i8.c: Regenerated.
         * generated/sum_r10.c: Regenerated.
         * generated/sum_r16.c: Regenerated.
         * generated/sum_r4.c: Regenerated.
         * generated/sum_r8.c: Regenerated.



git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@192895 138bc75d-0d04-0410-961f-82ee72b054a4

120 files changed, 352 insertions, 805 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index d52648688f7..5e59dceb6e6 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,125 @@
+2012-10-28  Tobias Burnus  <burnus@net-b.de>
+
+	 * m4/bessel.m4: Remove useless statement.
+	 * m4/ifunction.m4: Remove unreachable code.
+	 * generated/bessel_r10.c: Regenerated.
+	 * generated/bessel_r16.c: Regenerated.
+	 * generated/bessel_r4.c: Regenerated.
+	 * generated/bessel_r8.c: Regenerated.
+	 * generated/iall_i1.c: Regenerated.
+	 * generated/iall_i16.c: Regenerated.
+	 * generated/iall_i2.c: Regenerated.
+	 * generated/iall_i4.c: Regenerated.
+	 * generated/iall_i8.c: Regenerated.
+	 * generated/iany_i1.c: Regenerated.
+	 * generated/iany_i16.c: Regenerated.
+	 * generated/iany_i2.c: Regenerated.
+	 * generated/iany_i4.c: Regenerated.
+	 * generated/iany_i8.c: Regenerated.
+	 * generated/iparity_i1.c: Regenerated.
+	 * generated/iparity_i16.c: Regenerated.
+	 * generated/iparity_i2.c: Regenerated.
+	 * generated/iparity_i4.c: Regenerated.
+	 * generated/iparity_i8.c: Regenerated.
+	 * generated/maxloc1_16_i1.c: Regenerated.
+	 * generated/maxloc1_16_i16.c: Regenerated.
+	 * generated/maxloc1_16_i2.c: Regenerated.
+	 * generated/maxloc1_16_i4.c: Regenerated.
+	 * generated/maxloc1_16_i8.c: Regenerated.
+	 * generated/maxloc1_16_r10.c: Regenerated.
+	 * generated/maxloc1_16_r16.c: Regenerated.
+	 * generated/maxloc1_16_r4.c: Regenerated.
+	 * generated/maxloc1_16_r8.c: Regenerated.
+	 * generated/maxloc1_4_i1.c: Regenerated.
+	 * generated/maxloc1_4_i16.c: Regenerated.
+	 * generated/maxloc1_4_i2.c: Regenerated.
+	 * generated/maxloc1_4_i4.c: Regenerated.
+	 * generated/maxloc1_4_i8.c: Regenerated.
+	 * generated/maxloc1_4_r10.c: Regenerated.
+	 * generated/maxloc1_4_r16.c: Regenerated.
+	 * generated/maxloc1_4_r4.c: Regenerated.
+	 * generated/maxloc1_4_r8.c: Regenerated.
+	 * generated/maxloc1_8_i1.c: Regenerated.
+	 * generated/maxloc1_8_i16.c: Regenerated.
+	 * generated/maxloc1_8_i2.c: Regenerated.
+	 * generated/maxloc1_8_i4.c: Regenerated.
+	 * generated/maxloc1_8_i8.c: Regenerated.
+	 * generated/maxloc1_8_r10.c: Regenerated.
+	 * generated/maxloc1_8_r16.c: Regenerated.
+	 * generated/maxloc1_8_r4.c: Regenerated.
+	 * generated/maxloc1_8_r8.c: Regenerated.
+	 * generated/maxval_i1.c: Regenerated.
+	 * generated/maxval_i16.c: Regenerated.
+	 * generated/maxval_i2.c: Regenerated.
+	 * generated/maxval_i4.c: Regenerated.
+	 * generated/maxval_i8.c: Regenerated.
+	 * generated/maxval_r10.c: Regenerated.
+	 * generated/maxval_r16.c: Regenerated.
+	 * generated/maxval_r4.c: Regenerated.
+	 * generated/maxval_r8.c: Regenerated.
+	 * generated/minloc1_16_i1.c: Regenerated.
+	 * generated/minloc1_16_i16.c: Regenerated.
+	 * generated/minloc1_16_i2.c: Regenerated.
+	 * generated/minloc1_16_i4.c: Regenerated.
+	 * generated/minloc1_16_i8.c: Regenerated.
+	 * generated/minloc1_16_r10.c: Regenerated.
+	 * generated/minloc1_16_r16.c: Regenerated.
+	 * generated/minloc1_16_r4.c: Regenerated.
+	 * generated/minloc1_16_r8.c: Regenerated.
+	 * generated/minloc1_4_i1.c: Regenerated.
+	 * generated/minloc1_4_i16.c: Regenerated.
+	 * generated/minloc1_4_i2.c: Regenerated.
+	 * generated/minloc1_4_i4.c: Regenerated.
+	 * generated/minloc1_4_i8.c: Regenerated.
+	 * generated/minloc1_4_r10.c: Regenerated.
+	 * generated/minloc1_4_r16.c: Regenerated.
+	 * generated/minloc1_4_r4.c: Regenerated.
+	 * generated/minloc1_4_r8.c: Regenerated.
+	 * generated/minloc1_8_i1.c: Regenerated.
+	 * generated/minloc1_8_i16.c: Regenerated.
+	 * generated/minloc1_8_i2.c: Regenerated.
+	 * generated/minloc1_8_i4.c: Regenerated.
+	 * generated/minloc1_8_i8.c: Regenerated.
+	 * generated/minloc1_8_r10.c: Regenerated.
+	 * generated/minloc1_8_r16.c: Regenerated.
+	 * generated/minloc1_8_r4.c: Regenerated.
+	 * generated/minloc1_8_r8.c: Regenerated.
+	 * generated/minval_i1.c: Regenerated.
+	 * generated/minval_i16.c: Regenerated.
+	 * generated/minval_i2.c: Regenerated.
+	 * generated/minval_i4.c: Regenerated.
+	 * generated/minval_i8.c: Regenerated.
+	 * generated/minval_r10.c: Regenerated.
+	 * generated/minval_r16.c: Regenerated.
+	 * generated/minval_r4.c: Regenerated.
+	 * generated/minval_r8.c: Regenerated.
+	 * generated/product_c10.c: Regenerated.
+	 * generated/product_c16.c: Regenerated.
+	 * generated/product_c4.c: Regenerated.
+	 * generated/product_c8.c: Regenerated.
+	 * generated/product_i1.c: Regenerated.
+	 * generated/product_i16.c: Regenerated.
+	 * generated/product_i2.c: Regenerated.
+	 * generated/product_i4.c: Regenerated.
+	 * generated/product_i8.c: Regenerated.
+	 * generated/product_r10.c: Regenerated.
+	 * generated/product_r16.c: Regenerated.
+	 * generated/product_r4.c: Regenerated.
+	 * generated/product_r8.c: Regenerated.
+	 * generated/sum_c10.c: Regenerated.
+	 * generated/sum_c16.c: Regenerated.
+	 * generated/sum_c4.c: Regenerated.
+	 * generated/sum_c8.c: Regenerated.
+	 * generated/sum_i1.c: Regenerated.
+	 * generated/sum_i16.c: Regenerated.
+	 * generated/sum_i2.c: Regenerated.
+	 * generated/sum_i4.c: Regenerated.
+	 * generated/sum_i8.c: Regenerated.
+	 * generated/sum_r10.c: Regenerated.
+	 * generated/sum_r16.c: Regenerated.
+	 * generated/sum_r4.c: Regenerated.
+	 * generated/sum_r8.c: Regenerated.
+
 2012-10-10  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/54878
diff --git a/libgfortran/generated/bessel_r10.c b/libgfortran/generated/bessel_r10.c
index 6a3a139fdb7..cdfdac92b3f 100644
--- a/libgfortran/generated/bessel_r10.c
+++ b/libgfortran/generated/bessel_r10.c
@@ -148,7 +148,6 @@ bessel_yn_r10 (gfc_array_r10 * const restrict ret, int n1, int n2,
       return;
     }
 
-  ret->base_addr = ret->base_addr;
   last1 = MATHFUNC(yn) (n1, x);
   ret->base_addr[0] = last1;
 
diff --git a/libgfortran/generated/bessel_r16.c b/libgfortran/generated/bessel_r16.c
index c1aa5e25570..65a7bfbebbd 100644
--- a/libgfortran/generated/bessel_r16.c
+++ b/libgfortran/generated/bessel_r16.c
@@ -152,7 +152,6 @@ bessel_yn_r16 (gfc_array_r16 * const restrict ret, int n1, int n2,
       return;
     }
 
-  ret->base_addr = ret->base_addr;
   last1 = MATHFUNC(yn) (n1, x);
   ret->base_addr[0] = last1;
 
diff --git a/libgfortran/generated/bessel_r4.c b/libgfortran/generated/bessel_r4.c
index 0f7c4cc4233..7dc967ca7e2 100644
--- a/libgfortran/generated/bessel_r4.c
+++ b/libgfortran/generated/bessel_r4.c
@@ -148,7 +148,6 @@ bessel_yn_r4 (gfc_array_r4 * const restrict ret, int n1, int n2,
       return;
     }
 
-  ret->base_addr = ret->base_addr;
   last1 = MATHFUNC(yn) (n1, x);
   ret->base_addr[0] = last1;
 
diff --git a/libgfortran/generated/bessel_r8.c b/libgfortran/generated/bessel_r8.c
index cc61300057a..031726d3ff7 100644
--- a/libgfortran/generated/bessel_r8.c
+++ b/libgfortran/generated/bessel_r8.c
@@ -148,7 +148,6 @@ bessel_yn_r8 (gfc_array_r8 * const restrict ret, int n1, int n2,
       return;
     }
 
-  ret->base_addr = ret->base_addr;
   last1 = MATHFUNC(yn) (n1, x);
   ret->base_addr[0] = last1;
 
diff --git a/libgfortran/generated/iall_i1.c b/libgfortran/generated/iall_i1.c
index dbe0fa74d70..039cfda6045 100644
--- a/libgfortran/generated/iall_i1.c
+++ b/libgfortran/generated/iall_i1.c
@@ -323,18 +323,13 @@ miall_i1 (gfc_array_i1 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result &= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iall_i16.c b/libgfortran/generated/iall_i16.c
index 02e61fdc4a6..e41493d69af 100644
--- a/libgfortran/generated/iall_i16.c
+++ b/libgfortran/generated/iall_i16.c
@@ -323,18 +323,13 @@ miall_i16 (gfc_array_i16 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result &= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iall_i2.c b/libgfortran/generated/iall_i2.c
index e9c181c5309..7d8e9ee001f 100644
--- a/libgfortran/generated/iall_i2.c
+++ b/libgfortran/generated/iall_i2.c
@@ -323,18 +323,13 @@ miall_i2 (gfc_array_i2 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result &= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iall_i4.c b/libgfortran/generated/iall_i4.c
index 8cd3b3e9acf..1ecc9661cb5 100644
--- a/libgfortran/generated/iall_i4.c
+++ b/libgfortran/generated/iall_i4.c
@@ -323,18 +323,13 @@ miall_i4 (gfc_array_i4 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result &= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iall_i8.c b/libgfortran/generated/iall_i8.c
index 8e2bb1ad46d..87ba710d4f3 100644
--- a/libgfortran/generated/iall_i8.c
+++ b/libgfortran/generated/iall_i8.c
@@ -323,18 +323,13 @@ miall_i8 (gfc_array_i8 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result &= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iany_i1.c b/libgfortran/generated/iany_i1.c
index 52b6f923fec..2c8b85fab31 100644
--- a/libgfortran/generated/iany_i1.c
+++ b/libgfortran/generated/iany_i1.c
@@ -323,18 +323,13 @@ miany_i1 (gfc_array_i1 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result |= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iany_i16.c b/libgfortran/generated/iany_i16.c
index 9194aa57315..1ad55dd0a18 100644
--- a/libgfortran/generated/iany_i16.c
+++ b/libgfortran/generated/iany_i16.c
@@ -323,18 +323,13 @@ miany_i16 (gfc_array_i16 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result |= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iany_i2.c b/libgfortran/generated/iany_i2.c
index dcad9910490..f9b3380afb8 100644
--- a/libgfortran/generated/iany_i2.c
+++ b/libgfortran/generated/iany_i2.c
@@ -323,18 +323,13 @@ miany_i2 (gfc_array_i2 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result |= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iany_i4.c b/libgfortran/generated/iany_i4.c
index 46a5d83062e..12aa4f0c385 100644
--- a/libgfortran/generated/iany_i4.c
+++ b/libgfortran/generated/iany_i4.c
@@ -323,18 +323,13 @@ miany_i4 (gfc_array_i4 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result |= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iany_i8.c b/libgfortran/generated/iany_i8.c
index f0a2e904dd9..ed5704f85c4 100644
--- a/libgfortran/generated/iany_i8.c
+++ b/libgfortran/generated/iany_i8.c
@@ -323,18 +323,13 @@ miany_i8 (gfc_array_i8 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result |= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iparity_i1.c b/libgfortran/generated/iparity_i1.c
index 00eb4bcac9f..e7faa525212 100644
--- a/libgfortran/generated/iparity_i1.c
+++ b/libgfortran/generated/iparity_i1.c
@@ -323,18 +323,13 @@ miparity_i1 (gfc_array_i1 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result ^= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iparity_i16.c b/libgfortran/generated/iparity_i16.c
index 6caad71db79..48b26d9b630 100644
--- a/libgfortran/generated/iparity_i16.c
+++ b/libgfortran/generated/iparity_i16.c
@@ -323,18 +323,13 @@ miparity_i16 (gfc_array_i16 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result ^= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iparity_i2.c b/libgfortran/generated/iparity_i2.c
index c44f908035a..6711a2c1a0a 100644
--- a/libgfortran/generated/iparity_i2.c
+++ b/libgfortran/generated/iparity_i2.c
@@ -323,18 +323,13 @@ miparity_i2 (gfc_array_i2 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result ^= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iparity_i4.c b/libgfortran/generated/iparity_i4.c
index a7f76c8268d..242f6c73d43 100644
--- a/libgfortran/generated/iparity_i4.c
+++ b/libgfortran/generated/iparity_i4.c
@@ -323,18 +323,13 @@ miparity_i4 (gfc_array_i4 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result ^= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/iparity_i8.c b/libgfortran/generated/iparity_i8.c
index e93389df0fe..aa15b9176fd 100644
--- a/libgfortran/generated/iparity_i8.c
+++ b/libgfortran/generated/iparity_i8.c
@@ -323,18 +323,13 @@ miparity_i8 (gfc_array_i8 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result ^= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_i1.c b/libgfortran/generated/maxloc1_16_i1.c
index e2eb8e0a7b0..bec651f3957 100644
--- a/libgfortran/generated/maxloc1_16_i1.c
+++ b/libgfortran/generated/maxloc1_16_i1.c
@@ -354,12 +354,8 @@ mmaxloc1_16_i1 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_i1 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_i16.c b/libgfortran/generated/maxloc1_16_i16.c
index 9b3563f9677..24d3de908c4 100644
--- a/libgfortran/generated/maxloc1_16_i16.c
+++ b/libgfortran/generated/maxloc1_16_i16.c
@@ -354,12 +354,8 @@ mmaxloc1_16_i16 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_i16 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_i2.c b/libgfortran/generated/maxloc1_16_i2.c
index 0278e99dc8b..4236ab46200 100644
--- a/libgfortran/generated/maxloc1_16_i2.c
+++ b/libgfortran/generated/maxloc1_16_i2.c
@@ -354,12 +354,8 @@ mmaxloc1_16_i2 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_i2 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_i4.c b/libgfortran/generated/maxloc1_16_i4.c
index 9751c2afec2..133690ee06d 100644
--- a/libgfortran/generated/maxloc1_16_i4.c
+++ b/libgfortran/generated/maxloc1_16_i4.c
@@ -354,12 +354,8 @@ mmaxloc1_16_i4 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_i4 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_i8.c b/libgfortran/generated/maxloc1_16_i8.c
index e9140e5f868..7922dfd3055 100644
--- a/libgfortran/generated/maxloc1_16_i8.c
+++ b/libgfortran/generated/maxloc1_16_i8.c
@@ -354,12 +354,8 @@ mmaxloc1_16_i8 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_i8 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_r10.c b/libgfortran/generated/maxloc1_16_r10.c
index f88d254b295..73ff493fd0b 100644
--- a/libgfortran/generated/maxloc1_16_r10.c
+++ b/libgfortran/generated/maxloc1_16_r10.c
@@ -354,12 +354,8 @@ mmaxloc1_16_r10 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_r10 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_r16.c b/libgfortran/generated/maxloc1_16_r16.c
index b1188a2c795..952872a10d0 100644
--- a/libgfortran/generated/maxloc1_16_r16.c
+++ b/libgfortran/generated/maxloc1_16_r16.c
@@ -354,12 +354,8 @@ mmaxloc1_16_r16 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_r16 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_r4.c b/libgfortran/generated/maxloc1_16_r4.c
index 70611027985..32c704a8be6 100644
--- a/libgfortran/generated/maxloc1_16_r4.c
+++ b/libgfortran/generated/maxloc1_16_r4.c
@@ -354,12 +354,8 @@ mmaxloc1_16_r4 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_r4 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_16_r8.c b/libgfortran/generated/maxloc1_16_r8.c
index 5d4d9c27c9f..714591ee6b3 100644
--- a/libgfortran/generated/maxloc1_16_r8.c
+++ b/libgfortran/generated/maxloc1_16_r8.c
@@ -354,12 +354,8 @@ mmaxloc1_16_r8 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_16_r8 (gfc_array_i16 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_i1.c b/libgfortran/generated/maxloc1_4_i1.c
index 0ee6ed54898..9e8e8f0c1b5 100644
--- a/libgfortran/generated/maxloc1_4_i1.c
+++ b/libgfortran/generated/maxloc1_4_i1.c
@@ -354,12 +354,8 @@ mmaxloc1_4_i1 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_i1 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_i16.c b/libgfortran/generated/maxloc1_4_i16.c
index c79f0ca0717..8987a552bcd 100644
--- a/libgfortran/generated/maxloc1_4_i16.c
+++ b/libgfortran/generated/maxloc1_4_i16.c
@@ -354,12 +354,8 @@ mmaxloc1_4_i16 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_i16 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_i2.c b/libgfortran/generated/maxloc1_4_i2.c
index 4eff28acb14..42c51c9149b 100644
--- a/libgfortran/generated/maxloc1_4_i2.c
+++ b/libgfortran/generated/maxloc1_4_i2.c
@@ -354,12 +354,8 @@ mmaxloc1_4_i2 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_i2 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_i4.c b/libgfortran/generated/maxloc1_4_i4.c
index 7c8f5e6e534..49183407c97 100644
--- a/libgfortran/generated/maxloc1_4_i4.c
+++ b/libgfortran/generated/maxloc1_4_i4.c
@@ -354,12 +354,8 @@ mmaxloc1_4_i4 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_i4 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_i8.c b/libgfortran/generated/maxloc1_4_i8.c
index ae63e1b1b38..47b204dc27a 100644
--- a/libgfortran/generated/maxloc1_4_i8.c
+++ b/libgfortran/generated/maxloc1_4_i8.c
@@ -354,12 +354,8 @@ mmaxloc1_4_i8 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_i8 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_r10.c b/libgfortran/generated/maxloc1_4_r10.c
index afd935b39ab..82de89ca9e3 100644
--- a/libgfortran/generated/maxloc1_4_r10.c
+++ b/libgfortran/generated/maxloc1_4_r10.c
@@ -354,12 +354,8 @@ mmaxloc1_4_r10 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_r10 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_r16.c b/libgfortran/generated/maxloc1_4_r16.c
index fdd48172234..4a4c54fd999 100644
--- a/libgfortran/generated/maxloc1_4_r16.c
+++ b/libgfortran/generated/maxloc1_4_r16.c
@@ -354,12 +354,8 @@ mmaxloc1_4_r16 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_r16 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_r4.c b/libgfortran/generated/maxloc1_4_r4.c
index 8360dfcdbca..5b1bf25689b 100644
--- a/libgfortran/generated/maxloc1_4_r4.c
+++ b/libgfortran/generated/maxloc1_4_r4.c
@@ -354,12 +354,8 @@ mmaxloc1_4_r4 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_r4 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_4_r8.c b/libgfortran/generated/maxloc1_4_r8.c
index 96f36511dc0..eafacb35d3c 100644
--- a/libgfortran/generated/maxloc1_4_r8.c
+++ b/libgfortran/generated/maxloc1_4_r8.c
@@ -354,12 +354,8 @@ mmaxloc1_4_r8 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_4_r8 (gfc_array_i4 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_i1.c b/libgfortran/generated/maxloc1_8_i1.c
index a5911718942..1483c7e8a66 100644
--- a/libgfortran/generated/maxloc1_8_i1.c
+++ b/libgfortran/generated/maxloc1_8_i1.c
@@ -354,12 +354,8 @@ mmaxloc1_8_i1 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_i1 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_i16.c b/libgfortran/generated/maxloc1_8_i16.c
index 30b946ae36b..22806ba5eb9 100644
--- a/libgfortran/generated/maxloc1_8_i16.c
+++ b/libgfortran/generated/maxloc1_8_i16.c
@@ -354,12 +354,8 @@ mmaxloc1_8_i16 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_i16 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_i2.c b/libgfortran/generated/maxloc1_8_i2.c
index af32584ccf8..04eadbf5b2c 100644
--- a/libgfortran/generated/maxloc1_8_i2.c
+++ b/libgfortran/generated/maxloc1_8_i2.c
@@ -354,12 +354,8 @@ mmaxloc1_8_i2 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_i2 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_i4.c b/libgfortran/generated/maxloc1_8_i4.c
index dc63f1e71a2..f6866614109 100644
--- a/libgfortran/generated/maxloc1_8_i4.c
+++ b/libgfortran/generated/maxloc1_8_i4.c
@@ -354,12 +354,8 @@ mmaxloc1_8_i4 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_i4 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_i8.c b/libgfortran/generated/maxloc1_8_i8.c
index c50965edae4..714d3a7cb40 100644
--- a/libgfortran/generated/maxloc1_8_i8.c
+++ b/libgfortran/generated/maxloc1_8_i8.c
@@ -354,12 +354,8 @@ mmaxloc1_8_i8 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_i8 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_r10.c b/libgfortran/generated/maxloc1_8_r10.c
index c088686b564..0a07af582b6 100644
--- a/libgfortran/generated/maxloc1_8_r10.c
+++ b/libgfortran/generated/maxloc1_8_r10.c
@@ -354,12 +354,8 @@ mmaxloc1_8_r10 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_r10 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_r16.c b/libgfortran/generated/maxloc1_8_r16.c
index 35f68071ca3..8da4dd46936 100644
--- a/libgfortran/generated/maxloc1_8_r16.c
+++ b/libgfortran/generated/maxloc1_8_r16.c
@@ -354,12 +354,8 @@ mmaxloc1_8_r16 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_r16 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_r4.c b/libgfortran/generated/maxloc1_8_r4.c
index 5d84bd077e0..5c71e4242c5 100644
--- a/libgfortran/generated/maxloc1_8_r4.c
+++ b/libgfortran/generated/maxloc1_8_r4.c
@@ -354,12 +354,8 @@ mmaxloc1_8_r4 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_r4 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxloc1_8_r8.c b/libgfortran/generated/maxloc1_8_r8.c
index e1e80d3298d..3bdcdabba59 100644
--- a/libgfortran/generated/maxloc1_8_r8.c
+++ b/libgfortran/generated/maxloc1_8_r8.c
@@ -354,12 +354,8 @@ mmaxloc1_8_r8 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mmaxloc1_8_r8 (gfc_array_i8 * const restrict retarray,
 		    maxval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_i1.c b/libgfortran/generated/maxval_i1.c
index a94eecae000..6e77368cc4f 100644
--- a/libgfortran/generated/maxval_i1.c
+++ b/libgfortran/generated/maxval_i1.c
@@ -344,12 +344,8 @@ mmaxval_i1 (gfc_array_i1 * const restrict retarray,
 #if defined (GFC_INTEGER_1_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = (-GFC_INTEGER_1_HUGE-1);
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_1_INFINITY) || defined (GFC_INTEGER_1_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_i1 (gfc_array_i1 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_i16.c b/libgfortran/generated/maxval_i16.c
index 94059cb1a02..e1cafc2adc8 100644
--- a/libgfortran/generated/maxval_i16.c
+++ b/libgfortran/generated/maxval_i16.c
@@ -344,12 +344,8 @@ mmaxval_i16 (gfc_array_i16 * const restrict retarray,
 #if defined (GFC_INTEGER_16_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = (-GFC_INTEGER_16_HUGE-1);
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_16_INFINITY) || defined (GFC_INTEGER_16_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_i16 (gfc_array_i16 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_i2.c b/libgfortran/generated/maxval_i2.c
index eb3d767e31a..959ad434261 100644
--- a/libgfortran/generated/maxval_i2.c
+++ b/libgfortran/generated/maxval_i2.c
@@ -344,12 +344,8 @@ mmaxval_i2 (gfc_array_i2 * const restrict retarray,
 #if defined (GFC_INTEGER_2_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = (-GFC_INTEGER_2_HUGE-1);
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_2_INFINITY) || defined (GFC_INTEGER_2_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_i2 (gfc_array_i2 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_i4.c b/libgfortran/generated/maxval_i4.c
index ef9e6c91826..698653b65bb 100644
--- a/libgfortran/generated/maxval_i4.c
+++ b/libgfortran/generated/maxval_i4.c
@@ -344,12 +344,8 @@ mmaxval_i4 (gfc_array_i4 * const restrict retarray,
 #if defined (GFC_INTEGER_4_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = (-GFC_INTEGER_4_HUGE-1);
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_4_INFINITY) || defined (GFC_INTEGER_4_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_i4 (gfc_array_i4 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_i8.c b/libgfortran/generated/maxval_i8.c
index a6cd6829a3f..9b4a0330177 100644
--- a/libgfortran/generated/maxval_i8.c
+++ b/libgfortran/generated/maxval_i8.c
@@ -344,12 +344,8 @@ mmaxval_i8 (gfc_array_i8 * const restrict retarray,
 #if defined (GFC_INTEGER_8_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = (-GFC_INTEGER_8_HUGE-1);
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_8_INFINITY) || defined (GFC_INTEGER_8_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_i8 (gfc_array_i8 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_r10.c b/libgfortran/generated/maxval_r10.c
index 1be75f1fe2f..434096d8d44 100644
--- a/libgfortran/generated/maxval_r10.c
+++ b/libgfortran/generated/maxval_r10.c
@@ -344,12 +344,8 @@ mmaxval_r10 (gfc_array_r10 * const restrict retarray,
 #if defined (GFC_REAL_10_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = -GFC_REAL_10_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_REAL_10_INFINITY) || defined (GFC_REAL_10_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_r10 (gfc_array_r10 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_r16.c b/libgfortran/generated/maxval_r16.c
index 059896daf6b..0246e926744 100644
--- a/libgfortran/generated/maxval_r16.c
+++ b/libgfortran/generated/maxval_r16.c
@@ -344,12 +344,8 @@ mmaxval_r16 (gfc_array_r16 * const restrict retarray,
 #if defined (GFC_REAL_16_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = -GFC_REAL_16_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_REAL_16_INFINITY) || defined (GFC_REAL_16_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_r16 (gfc_array_r16 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_r4.c b/libgfortran/generated/maxval_r4.c
index f306f181f52..d3e0c30a1d5 100644
--- a/libgfortran/generated/maxval_r4.c
+++ b/libgfortran/generated/maxval_r4.c
@@ -344,12 +344,8 @@ mmaxval_r4 (gfc_array_r4 * const restrict retarray,
 #if defined (GFC_REAL_4_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = -GFC_REAL_4_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_REAL_4_INFINITY) || defined (GFC_REAL_4_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_r4 (gfc_array_r4 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/maxval_r8.c b/libgfortran/generated/maxval_r8.c
index ca70ca5a9e5..b849baf5a82 100644
--- a/libgfortran/generated/maxval_r8.c
+++ b/libgfortran/generated/maxval_r8.c
@@ -344,12 +344,8 @@ mmaxval_r8 (gfc_array_r8 * const restrict retarray,
 #if defined (GFC_REAL_8_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = -GFC_REAL_8_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_REAL_8_INFINITY) || defined (GFC_REAL_8_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mmaxval_r8 (gfc_array_r8 * const restrict retarray,
 #endif
 		if (*msrc && *src > result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_i1.c b/libgfortran/generated/minloc1_16_i1.c
index 949fa434c1e..a019c28f84b 100644
--- a/libgfortran/generated/minloc1_16_i1.c
+++ b/libgfortran/generated/minloc1_16_i1.c
@@ -354,12 +354,8 @@ mminloc1_16_i1 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_i1 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_i16.c b/libgfortran/generated/minloc1_16_i16.c
index b5a16818365..54b250f34d4 100644
--- a/libgfortran/generated/minloc1_16_i16.c
+++ b/libgfortran/generated/minloc1_16_i16.c
@@ -354,12 +354,8 @@ mminloc1_16_i16 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_i16 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_i2.c b/libgfortran/generated/minloc1_16_i2.c
index 887907995d7..ef86efb1b43 100644
--- a/libgfortran/generated/minloc1_16_i2.c
+++ b/libgfortran/generated/minloc1_16_i2.c
@@ -354,12 +354,8 @@ mminloc1_16_i2 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_i2 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_i4.c b/libgfortran/generated/minloc1_16_i4.c
index 6a5553fd405..099b79da333 100644
--- a/libgfortran/generated/minloc1_16_i4.c
+++ b/libgfortran/generated/minloc1_16_i4.c
@@ -354,12 +354,8 @@ mminloc1_16_i4 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_i4 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_i8.c b/libgfortran/generated/minloc1_16_i8.c
index 04be9c60b95..db625d28957 100644
--- a/libgfortran/generated/minloc1_16_i8.c
+++ b/libgfortran/generated/minloc1_16_i8.c
@@ -354,12 +354,8 @@ mminloc1_16_i8 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_i8 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_r10.c b/libgfortran/generated/minloc1_16_r10.c
index a66feda39d5..44f1679390a 100644
--- a/libgfortran/generated/minloc1_16_r10.c
+++ b/libgfortran/generated/minloc1_16_r10.c
@@ -354,12 +354,8 @@ mminloc1_16_r10 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_r10 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_r16.c b/libgfortran/generated/minloc1_16_r16.c
index 2e75ecf46d2..f62311ecb83 100644
--- a/libgfortran/generated/minloc1_16_r16.c
+++ b/libgfortran/generated/minloc1_16_r16.c
@@ -354,12 +354,8 @@ mminloc1_16_r16 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_r16 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_r4.c b/libgfortran/generated/minloc1_16_r4.c
index b8e9337e8e2..4aa3bf82cb0 100644
--- a/libgfortran/generated/minloc1_16_r4.c
+++ b/libgfortran/generated/minloc1_16_r4.c
@@ -354,12 +354,8 @@ mminloc1_16_r4 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_r4 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_16_r8.c b/libgfortran/generated/minloc1_16_r8.c
index 42519eb3380..ee07deefa5d 100644
--- a/libgfortran/generated/minloc1_16_r8.c
+++ b/libgfortran/generated/minloc1_16_r8.c
@@ -354,12 +354,8 @@ mminloc1_16_r8 (gfc_array_i16 * const restrict retarray,
 	GFC_INTEGER_16 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_16_r8 (gfc_array_i16 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_16)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_i1.c b/libgfortran/generated/minloc1_4_i1.c
index 07f0dceb55e..9d266787d5f 100644
--- a/libgfortran/generated/minloc1_4_i1.c
+++ b/libgfortran/generated/minloc1_4_i1.c
@@ -354,12 +354,8 @@ mminloc1_4_i1 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_i1 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_i16.c b/libgfortran/generated/minloc1_4_i16.c
index 0c2041115d5..2659a257ca9 100644
--- a/libgfortran/generated/minloc1_4_i16.c
+++ b/libgfortran/generated/minloc1_4_i16.c
@@ -354,12 +354,8 @@ mminloc1_4_i16 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_i16 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_i2.c b/libgfortran/generated/minloc1_4_i2.c
index 389b1dbddfd..27cb56af2d9 100644
--- a/libgfortran/generated/minloc1_4_i2.c
+++ b/libgfortran/generated/minloc1_4_i2.c
@@ -354,12 +354,8 @@ mminloc1_4_i2 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_i2 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_i4.c b/libgfortran/generated/minloc1_4_i4.c
index 5d66fe9afcb..67f90842bc5 100644
--- a/libgfortran/generated/minloc1_4_i4.c
+++ b/libgfortran/generated/minloc1_4_i4.c
@@ -354,12 +354,8 @@ mminloc1_4_i4 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_i4 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_i8.c b/libgfortran/generated/minloc1_4_i8.c
index 28cd536fa4a..a5a66ee90a1 100644
--- a/libgfortran/generated/minloc1_4_i8.c
+++ b/libgfortran/generated/minloc1_4_i8.c
@@ -354,12 +354,8 @@ mminloc1_4_i8 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_i8 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_r10.c b/libgfortran/generated/minloc1_4_r10.c
index 39196711e32..7351db066ed 100644
--- a/libgfortran/generated/minloc1_4_r10.c
+++ b/libgfortran/generated/minloc1_4_r10.c
@@ -354,12 +354,8 @@ mminloc1_4_r10 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_r10 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_r16.c b/libgfortran/generated/minloc1_4_r16.c
index f7966123128..2917650402d 100644
--- a/libgfortran/generated/minloc1_4_r16.c
+++ b/libgfortran/generated/minloc1_4_r16.c
@@ -354,12 +354,8 @@ mminloc1_4_r16 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_r16 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_r4.c b/libgfortran/generated/minloc1_4_r4.c
index 7f34b913813..d80c89a5189 100644
--- a/libgfortran/generated/minloc1_4_r4.c
+++ b/libgfortran/generated/minloc1_4_r4.c
@@ -354,12 +354,8 @@ mminloc1_4_r4 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_r4 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_4_r8.c b/libgfortran/generated/minloc1_4_r8.c
index 21bb4cbcc77..79dfbb3f756 100644
--- a/libgfortran/generated/minloc1_4_r8.c
+++ b/libgfortran/generated/minloc1_4_r8.c
@@ -354,12 +354,8 @@ mminloc1_4_r8 (gfc_array_i4 * const restrict retarray,
 	GFC_INTEGER_4 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_4_r8 (gfc_array_i4 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_4)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_i1.c b/libgfortran/generated/minloc1_8_i1.c
index 81d6f8e42e1..62e300b80eb 100644
--- a/libgfortran/generated/minloc1_8_i1.c
+++ b/libgfortran/generated/minloc1_8_i1.c
@@ -354,12 +354,8 @@ mminloc1_8_i1 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_i1 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_i16.c b/libgfortran/generated/minloc1_8_i16.c
index 0a41d170062..56682c7a2fb 100644
--- a/libgfortran/generated/minloc1_8_i16.c
+++ b/libgfortran/generated/minloc1_8_i16.c
@@ -354,12 +354,8 @@ mminloc1_8_i16 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_i16 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_i2.c b/libgfortran/generated/minloc1_8_i2.c
index b0dac3e0404..819da19a319 100644
--- a/libgfortran/generated/minloc1_8_i2.c
+++ b/libgfortran/generated/minloc1_8_i2.c
@@ -354,12 +354,8 @@ mminloc1_8_i2 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_i2 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_i4.c b/libgfortran/generated/minloc1_8_i4.c
index c8b42cac5e2..b59bc3339a3 100644
--- a/libgfortran/generated/minloc1_8_i4.c
+++ b/libgfortran/generated/minloc1_8_i4.c
@@ -354,12 +354,8 @@ mminloc1_8_i4 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_i4 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_i8.c b/libgfortran/generated/minloc1_8_i8.c
index 186fe5ceacf..5caf88a1049 100644
--- a/libgfortran/generated/minloc1_8_i8.c
+++ b/libgfortran/generated/minloc1_8_i8.c
@@ -354,12 +354,8 @@ mminloc1_8_i8 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_i8 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_r10.c b/libgfortran/generated/minloc1_8_r10.c
index 582f88e1034..068efbb4e67 100644
--- a/libgfortran/generated/minloc1_8_r10.c
+++ b/libgfortran/generated/minloc1_8_r10.c
@@ -354,12 +354,8 @@ mminloc1_8_r10 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_r10 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_r16.c b/libgfortran/generated/minloc1_8_r16.c
index 0471c2750fb..09a3bed09f8 100644
--- a/libgfortran/generated/minloc1_8_r16.c
+++ b/libgfortran/generated/minloc1_8_r16.c
@@ -354,12 +354,8 @@ mminloc1_8_r16 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_r16 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_r4.c b/libgfortran/generated/minloc1_8_r4.c
index b144115c0bc..41b5b722781 100644
--- a/libgfortran/generated/minloc1_8_r4.c
+++ b/libgfortran/generated/minloc1_8_r4.c
@@ -354,12 +354,8 @@ mminloc1_8_r4 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_r4 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minloc1_8_r8.c b/libgfortran/generated/minloc1_8_r8.c
index 81916e2890a..4eb97b4f622 100644
--- a/libgfortran/generated/minloc1_8_r8.c
+++ b/libgfortran/generated/minloc1_8_r8.c
@@ -354,12 +354,8 @@ mminloc1_8_r8 (gfc_array_i8 * const restrict retarray,
 	GFC_INTEGER_8 result2 = 0;
 #endif
 	result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 		if (*msrc)
 		  {
@@ -387,9 +383,8 @@ mminloc1_8_r8 (gfc_array_i8 * const restrict retarray,
 		    minval = *src;
 		    result = (GFC_INTEGER_8)n + 1;
 		  }
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_i1.c b/libgfortran/generated/minval_i1.c
index e2abc9587f0..461236e8992 100644
--- a/libgfortran/generated/minval_i1.c
+++ b/libgfortran/generated/minval_i1.c
@@ -344,12 +344,8 @@ mminval_i1 (gfc_array_i1 * const restrict retarray,
 #if defined (GFC_INTEGER_1_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_INTEGER_1_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_1_INFINITY) || defined (GFC_INTEGER_1_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_i1 (gfc_array_i1 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_i16.c b/libgfortran/generated/minval_i16.c
index f2c72e3e9de..f32316d8970 100644
--- a/libgfortran/generated/minval_i16.c
+++ b/libgfortran/generated/minval_i16.c
@@ -344,12 +344,8 @@ mminval_i16 (gfc_array_i16 * const restrict retarray,
 #if defined (GFC_INTEGER_16_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_INTEGER_16_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_16_INFINITY) || defined (GFC_INTEGER_16_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_i16 (gfc_array_i16 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_i2.c b/libgfortran/generated/minval_i2.c
index b87a0722744..dd7bc2159fb 100644
--- a/libgfortran/generated/minval_i2.c
+++ b/libgfortran/generated/minval_i2.c
@@ -344,12 +344,8 @@ mminval_i2 (gfc_array_i2 * const restrict retarray,
 #if defined (GFC_INTEGER_2_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_INTEGER_2_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_2_INFINITY) || defined (GFC_INTEGER_2_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_i2 (gfc_array_i2 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_i4.c b/libgfortran/generated/minval_i4.c
index 20766fa62b1..33e9016e502 100644
--- a/libgfortran/generated/minval_i4.c
+++ b/libgfortran/generated/minval_i4.c
@@ -344,12 +344,8 @@ mminval_i4 (gfc_array_i4 * const restrict retarray,
 #if defined (GFC_INTEGER_4_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_INTEGER_4_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_4_INFINITY) || defined (GFC_INTEGER_4_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_i4 (gfc_array_i4 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_i8.c b/libgfortran/generated/minval_i8.c
index 73e3d9bba8f..165600cc1e6 100644
--- a/libgfortran/generated/minval_i8.c
+++ b/libgfortran/generated/minval_i8.c
@@ -344,12 +344,8 @@ mminval_i8 (gfc_array_i8 * const restrict retarray,
 #if defined (GFC_INTEGER_8_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_INTEGER_8_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_INTEGER_8_INFINITY) || defined (GFC_INTEGER_8_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_i8 (gfc_array_i8 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_r10.c b/libgfortran/generated/minval_r10.c
index 72134fe7013..9c77f085d0b 100644
--- a/libgfortran/generated/minval_r10.c
+++ b/libgfortran/generated/minval_r10.c
@@ -344,12 +344,8 @@ mminval_r10 (gfc_array_r10 * const restrict retarray,
 #if defined (GFC_REAL_10_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_REAL_10_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_REAL_10_INFINITY) || defined (GFC_REAL_10_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_r10 (gfc_array_r10 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_r16.c b/libgfortran/generated/minval_r16.c
index 47c703ccc85..dcfeab19942 100644
--- a/libgfortran/generated/minval_r16.c
+++ b/libgfortran/generated/minval_r16.c
@@ -344,12 +344,8 @@ mminval_r16 (gfc_array_r16 * const restrict retarray,
 #if defined (GFC_REAL_16_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_REAL_16_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_REAL_16_INFINITY) || defined (GFC_REAL_16_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_r16 (gfc_array_r16 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_r4.c b/libgfortran/generated/minval_r4.c
index 58c8854a537..014471a87cd 100644
--- a/libgfortran/generated/minval_r4.c
+++ b/libgfortran/generated/minval_r4.c
@@ -344,12 +344,8 @@ mminval_r4 (gfc_array_r4 * const restrict retarray,
 #if defined (GFC_REAL_4_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_REAL_4_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_REAL_4_INFINITY) || defined (GFC_REAL_4_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_r4 (gfc_array_r4 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/minval_r8.c b/libgfortran/generated/minval_r8.c
index c8426bd905a..5a93248eafc 100644
--- a/libgfortran/generated/minval_r8.c
+++ b/libgfortran/generated/minval_r8.c
@@ -344,12 +344,8 @@ mminval_r8 (gfc_array_r8 * const restrict retarray,
 #if defined (GFC_REAL_8_QUIET_NAN)
 	int non_empty_p = 0;
 #endif
-	if (len <= 0)
-	  *dest = GFC_REAL_8_HUGE;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
 #if defined (GFC_REAL_8_INFINITY) || defined (GFC_REAL_8_QUIET_NAN)
 		if (*msrc)
@@ -374,9 +370,8 @@ mminval_r8 (gfc_array_r8 * const restrict retarray,
 #endif
 		if (*msrc && *src < result)
 		  result = *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_c10.c b/libgfortran/generated/product_c10.c
index 379f3892be6..ede6ce8a704 100644
--- a/libgfortran/generated/product_c10.c
+++ b/libgfortran/generated/product_c10.c
@@ -323,18 +323,13 @@ mproduct_c10 (gfc_array_c10 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_c16.c b/libgfortran/generated/product_c16.c
index 2e91c5e9cdd..f6ebf43f5ea 100644
--- a/libgfortran/generated/product_c16.c
+++ b/libgfortran/generated/product_c16.c
@@ -323,18 +323,13 @@ mproduct_c16 (gfc_array_c16 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_c4.c b/libgfortran/generated/product_c4.c
index c1a9534cb41..4bf17c3670b 100644
--- a/libgfortran/generated/product_c4.c
+++ b/libgfortran/generated/product_c4.c
@@ -323,18 +323,13 @@ mproduct_c4 (gfc_array_c4 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_c8.c b/libgfortran/generated/product_c8.c
index 80a6ac62789..0fe8ff194c6 100644
--- a/libgfortran/generated/product_c8.c
+++ b/libgfortran/generated/product_c8.c
@@ -323,18 +323,13 @@ mproduct_c8 (gfc_array_c8 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_i1.c b/libgfortran/generated/product_i1.c
index ff8e76a7b07..9ea168741aa 100644
--- a/libgfortran/generated/product_i1.c
+++ b/libgfortran/generated/product_i1.c
@@ -323,18 +323,13 @@ mproduct_i1 (gfc_array_i1 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_i16.c b/libgfortran/generated/product_i16.c
index 652e766b508..62be1e47cdb 100644
--- a/libgfortran/generated/product_i16.c
+++ b/libgfortran/generated/product_i16.c
@@ -323,18 +323,13 @@ mproduct_i16 (gfc_array_i16 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_i2.c b/libgfortran/generated/product_i2.c
index 1063d6acf98..1785cbdb580 100644
--- a/libgfortran/generated/product_i2.c
+++ b/libgfortran/generated/product_i2.c
@@ -323,18 +323,13 @@ mproduct_i2 (gfc_array_i2 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_i4.c b/libgfortran/generated/product_i4.c
index 97eab9e4766..9c52a12b096 100644
--- a/libgfortran/generated/product_i4.c
+++ b/libgfortran/generated/product_i4.c
@@ -323,18 +323,13 @@ mproduct_i4 (gfc_array_i4 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_i8.c b/libgfortran/generated/product_i8.c
index 89454971dd8..81840207a03 100644
--- a/libgfortran/generated/product_i8.c
+++ b/libgfortran/generated/product_i8.c
@@ -323,18 +323,13 @@ mproduct_i8 (gfc_array_i8 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_r10.c b/libgfortran/generated/product_r10.c
index 4259f7acb0c..324ce450bf3 100644
--- a/libgfortran/generated/product_r10.c
+++ b/libgfortran/generated/product_r10.c
@@ -323,18 +323,13 @@ mproduct_r10 (gfc_array_r10 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_r16.c b/libgfortran/generated/product_r16.c
index e4ec5b27268..16cbaa13aa3 100644
--- a/libgfortran/generated/product_r16.c
+++ b/libgfortran/generated/product_r16.c
@@ -323,18 +323,13 @@ mproduct_r16 (gfc_array_r16 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_r4.c b/libgfortran/generated/product_r4.c
index dc3fe513e90..38febae0171 100644
--- a/libgfortran/generated/product_r4.c
+++ b/libgfortran/generated/product_r4.c
@@ -323,18 +323,13 @@ mproduct_r4 (gfc_array_r4 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/product_r8.c b/libgfortran/generated/product_r8.c
index 5e03477710c..ee61b640801 100644
--- a/libgfortran/generated/product_r8.c
+++ b/libgfortran/generated/product_r8.c
@@ -323,18 +323,13 @@ mproduct_r8 (gfc_array_r8 * const restrict retarray,
       {
 
   result = 1;
-	if (len <= 0)
-	  *dest = 1;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result *= *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_c10.c b/libgfortran/generated/sum_c10.c
index 50567b3a270..cbe6de5a39a 100644
--- a/libgfortran/generated/sum_c10.c
+++ b/libgfortran/generated/sum_c10.c
@@ -323,18 +323,13 @@ msum_c10 (gfc_array_c10 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_c16.c b/libgfortran/generated/sum_c16.c
index 285b4449e77..37a080e51ea 100644
--- a/libgfortran/generated/sum_c16.c
+++ b/libgfortran/generated/sum_c16.c
@@ -323,18 +323,13 @@ msum_c16 (gfc_array_c16 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_c4.c b/libgfortran/generated/sum_c4.c
index bdaa1adc727..bc08e2cba79 100644
--- a/libgfortran/generated/sum_c4.c
+++ b/libgfortran/generated/sum_c4.c
@@ -323,18 +323,13 @@ msum_c4 (gfc_array_c4 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_c8.c b/libgfortran/generated/sum_c8.c
index e7a4a45aa03..5f0f544036c 100644
--- a/libgfortran/generated/sum_c8.c
+++ b/libgfortran/generated/sum_c8.c
@@ -323,18 +323,13 @@ msum_c8 (gfc_array_c8 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_i1.c b/libgfortran/generated/sum_i1.c
index 7b03bd05965..737dc2d231f 100644
--- a/libgfortran/generated/sum_i1.c
+++ b/libgfortran/generated/sum_i1.c
@@ -323,18 +323,13 @@ msum_i1 (gfc_array_i1 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_i16.c b/libgfortran/generated/sum_i16.c
index 71bf01a209c..34f0dadc530 100644
--- a/libgfortran/generated/sum_i16.c
+++ b/libgfortran/generated/sum_i16.c
@@ -323,18 +323,13 @@ msum_i16 (gfc_array_i16 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_i2.c b/libgfortran/generated/sum_i2.c
index 1d82782bef1..8c748994e69 100644
--- a/libgfortran/generated/sum_i2.c
+++ b/libgfortran/generated/sum_i2.c
@@ -323,18 +323,13 @@ msum_i2 (gfc_array_i2 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_i4.c b/libgfortran/generated/sum_i4.c
index 3e29bfa498a..d9e1b378716 100644
--- a/libgfortran/generated/sum_i4.c
+++ b/libgfortran/generated/sum_i4.c
@@ -323,18 +323,13 @@ msum_i4 (gfc_array_i4 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_i8.c b/libgfortran/generated/sum_i8.c
index 05767bc59c7..b0d38c68b04 100644
--- a/libgfortran/generated/sum_i8.c
+++ b/libgfortran/generated/sum_i8.c
@@ -323,18 +323,13 @@ msum_i8 (gfc_array_i8 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_r10.c b/libgfortran/generated/sum_r10.c
index 16ff425a617..bd2574dadaa 100644
--- a/libgfortran/generated/sum_r10.c
+++ b/libgfortran/generated/sum_r10.c
@@ -323,18 +323,13 @@ msum_r10 (gfc_array_r10 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_r16.c b/libgfortran/generated/sum_r16.c
index 3b2d8a60729..805e49e03d7 100644
--- a/libgfortran/generated/sum_r16.c
+++ b/libgfortran/generated/sum_r16.c
@@ -323,18 +323,13 @@ msum_r16 (gfc_array_r16 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_r4.c b/libgfortran/generated/sum_r4.c
index 5136dae2c80..ec918c2587d 100644
--- a/libgfortran/generated/sum_r4.c
+++ b/libgfortran/generated/sum_r4.c
@@ -323,18 +323,13 @@ msum_r4 (gfc_array_r4 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/generated/sum_r8.c b/libgfortran/generated/sum_r8.c
index 8634637434d..3bf49fec4a5 100644
--- a/libgfortran/generated/sum_r8.c
+++ b/libgfortran/generated/sum_r8.c
@@ -323,18 +323,13 @@ msum_r8 (gfc_array_r8 * const restrict retarray,
       {
 
   result = 0;
-	if (len <= 0)
-	  *dest = 0;
-	else
+	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 
   if (*msrc)
     result += *src;
-	      }
-	    *dest = result;
 	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
diff --git a/libgfortran/m4/bessel.m4 b/libgfortran/m4/bessel.m4
index d5c602dbf4c..145ca0d59ac 100644
--- a/libgfortran/m4/bessel.m4
+++ b/libgfortran/m4/bessel.m4
@@ -149,7 +149,6 @@ bessel_yn_r'rtype_kind` ('rtype` * const restrict ret, int n1, int n2,
       return;
     }
 
-  ret->base_addr = ret->base_addr;
   last1 = MATHFUNC(yn) (n1, x);
   ret->base_addr[0] = last1;
 
diff --git a/libgfortran/m4/ifunction.m4 b/libgfortran/m4/ifunction.m4
index 613fbf5dad5..1555aebbc4a 100644
--- a/libgfortran/m4/ifunction.m4
+++ b/libgfortran/m4/ifunction.m4
@@ -311,17 +311,12 @@ void
       {
 ')dnl
 define(START_MASKED_ARRAY_BLOCK,
-`	if (len <= 0)
-	  *dest = '$1`;
-	else
+`	for (n = 0; n < len; n++, src += delta, msrc += mdelta)
 	  {
-	    for (n = 0; n < len; n++, src += delta, msrc += mdelta)
-	      {
 ')dnl
 define(FINISH_MASKED_ARRAY_FUNCTION,
-`	      }
-	    *dest = result;
-	  }
+`	  }
+	*dest = result;
       }
       /* Advance to the next element.  */
       count[0]++;
@@ -500,6 +495,6 @@ FINISH_ARRAY_FUNCTION($4)')dnl
 define(MASKED_ARRAY_FUNCTION,
 `START_MASKED_ARRAY_FUNCTION
 $2
-START_MASKED_ARRAY_BLOCK($1)
+START_MASKED_ARRAY_BLOCK
 $3
 FINISH_MASKED_ARRAY_FUNCTION')dnl