https://gcc.gnu.org/g:15e40ea3959b59e882b5031ac06f10be9d4815f2

commit 15e40ea3959b59e882b5031ac06f10be9d4815f2
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Wed Apr 23 11:58:24 2025 +0200

    Correction régression minmaxloc_16

Diff:
---
 libgfortran/generated/maxloc0_16_s1.c | 4 ++--
 libgfortran/generated/maxloc0_16_s4.c | 4 ++--
 libgfortran/generated/maxloc0_4_s1.c  | 4 ++--
 libgfortran/generated/maxloc0_4_s4.c  | 4 ++--
 libgfortran/generated/maxloc0_8_s1.c  | 4 ++--
 libgfortran/generated/maxloc0_8_s4.c  | 4 ++--
 libgfortran/generated/minloc0_16_s1.c | 4 ++--
 libgfortran/generated/minloc0_16_s4.c | 4 ++--
 libgfortran/generated/minloc0_4_s1.c  | 4 ++--
 libgfortran/generated/minloc0_4_s4.c  | 4 ++--
 libgfortran/generated/minloc0_8_s1.c  | 4 ++--
 libgfortran/generated/minloc0_8_s4.c  | 4 ++--
 libgfortran/m4/maxloc0s.m4            | 4 ++--
 libgfortran/m4/minloc0s.m4            | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/libgfortran/generated/maxloc0_16_s1.c 
b/libgfortran/generated/maxloc0_16_s1.c
index 42c718f0aa61..e5e81dd28a83 100644
--- a/libgfortran/generated/maxloc0_16_s1.c
+++ b/libgfortran/generated/maxloc0_16_s1.c
@@ -116,7 +116,7 @@ maxloc0_16_s1 (gfc_array_i16 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_16, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mmaxloc0_16_s1 (gfc_array_i16 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_16, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/maxloc0_16_s4.c 
b/libgfortran/generated/maxloc0_16_s4.c
index 94ae08fda914..20ef05fb3268 100644
--- a/libgfortran/generated/maxloc0_16_s4.c
+++ b/libgfortran/generated/maxloc0_16_s4.c
@@ -116,7 +116,7 @@ maxloc0_16_s4 (gfc_array_i16 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_16, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mmaxloc0_16_s4 (gfc_array_i16 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_16, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/maxloc0_4_s1.c 
b/libgfortran/generated/maxloc0_4_s1.c
index c258b16a4a08..629b544fab1c 100644
--- a/libgfortran/generated/maxloc0_4_s1.c
+++ b/libgfortran/generated/maxloc0_4_s1.c
@@ -116,7 +116,7 @@ maxloc0_4_s1 (gfc_array_i4 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_4, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mmaxloc0_4_s1 (gfc_array_i4 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_4, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/maxloc0_4_s4.c 
b/libgfortran/generated/maxloc0_4_s4.c
index 89d090ccb30f..de596da6638c 100644
--- a/libgfortran/generated/maxloc0_4_s4.c
+++ b/libgfortran/generated/maxloc0_4_s4.c
@@ -116,7 +116,7 @@ maxloc0_4_s4 (gfc_array_i4 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_4, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mmaxloc0_4_s4 (gfc_array_i4 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_4, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/maxloc0_8_s1.c 
b/libgfortran/generated/maxloc0_8_s1.c
index 03ef68393158..3482fbc6d283 100644
--- a/libgfortran/generated/maxloc0_8_s1.c
+++ b/libgfortran/generated/maxloc0_8_s1.c
@@ -116,7 +116,7 @@ maxloc0_8_s1 (gfc_array_i8 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_8, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mmaxloc0_8_s1 (gfc_array_i8 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_8, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/maxloc0_8_s4.c 
b/libgfortran/generated/maxloc0_8_s4.c
index 1add4d2944f3..2617c64b182c 100644
--- a/libgfortran/generated/maxloc0_8_s4.c
+++ b/libgfortran/generated/maxloc0_8_s4.c
@@ -116,7 +116,7 @@ maxloc0_8_s4 (gfc_array_i8 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_8, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mmaxloc0_8_s4 (gfc_array_i8 * const restrict retarray,
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_8, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/minloc0_16_s1.c 
b/libgfortran/generated/minloc0_16_s1.c
index d503c9601678..72f7b2e2066a 100644
--- a/libgfortran/generated/minloc0_16_s1.c
+++ b/libgfortran/generated/minloc0_16_s1.c
@@ -116,7 +116,7 @@ minloc0_16_s1 (gfc_array_i16 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_16, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mminloc0_16_s1 (gfc_array_i16 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_16, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/minloc0_16_s4.c 
b/libgfortran/generated/minloc0_16_s4.c
index 452ba8b2c1a0..14625bd4f954 100644
--- a/libgfortran/generated/minloc0_16_s4.c
+++ b/libgfortran/generated/minloc0_16_s4.c
@@ -116,7 +116,7 @@ minloc0_16_s4 (gfc_array_i16 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_16, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mminloc0_16_s4 (gfc_array_i16 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_16, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/minloc0_4_s1.c 
b/libgfortran/generated/minloc0_4_s1.c
index 7fc5e8565b7a..c53371d0b333 100644
--- a/libgfortran/generated/minloc0_4_s1.c
+++ b/libgfortran/generated/minloc0_4_s1.c
@@ -116,7 +116,7 @@ minloc0_4_s1 (gfc_array_i4 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_4, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mminloc0_4_s1 (gfc_array_i4 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_4, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/minloc0_4_s4.c 
b/libgfortran/generated/minloc0_4_s4.c
index 757b4be3bcdd..f2fc3dc26af8 100644
--- a/libgfortran/generated/minloc0_4_s4.c
+++ b/libgfortran/generated/minloc0_4_s4.c
@@ -116,7 +116,7 @@ minloc0_4_s4 (gfc_array_i4 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_4, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mminloc0_4_s4 (gfc_array_i4 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_4, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/minloc0_8_s1.c 
b/libgfortran/generated/minloc0_8_s1.c
index f89c1e2bc12c..368f8076652c 100644
--- a/libgfortran/generated/minloc0_8_s1.c
+++ b/libgfortran/generated/minloc0_8_s1.c
@@ -116,7 +116,7 @@ minloc0_8_s1 (gfc_array_i8 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_8, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mminloc0_8_s1 (gfc_array_i8 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_8, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/generated/minloc0_8_s4.c 
b/libgfortran/generated/minloc0_8_s4.c
index e53486c65073..72f7c54e5cc9 100644
--- a/libgfortran/generated/minloc0_8_s4.c
+++ b/libgfortran/generated/minloc0_8_s4.c
@@ -116,7 +116,7 @@ minloc0_8_s4 (gfc_array_i8 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_8, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
@@ -260,7 +260,7 @@ mminloc0_8_s4 (gfc_array_i8 * const restrict retarray,
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (GFC_INTEGER_8, dest, n * dspacing) = count[n] + 1;
     }
          /* Implementation end.  */
          /* Advance to the next element.  */
diff --git a/libgfortran/m4/maxloc0s.m4 b/libgfortran/m4/maxloc0s.m4
index c7fa8997f503..d31743b44c3a 100644
--- a/libgfortran/m4/maxloc0s.m4
+++ b/libgfortran/m4/maxloc0s.m4
@@ -45,7 +45,7 @@ FOREACH_FUNCTION(
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = count[n] + 1;
     }')
 
 MASKED_FOREACH_FUNCTION(
@@ -59,7 +59,7 @@ MASKED_FOREACH_FUNCTION(
     {
       maxval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = count[n] + 1;
     }')
 
 SCALAR_FOREACH_FUNCTION(`0')
diff --git a/libgfortran/m4/minloc0s.m4 b/libgfortran/m4/minloc0s.m4
index 1f6fbc68d0c4..d6f0f8d4a073 100644
--- a/libgfortran/m4/minloc0s.m4
+++ b/libgfortran/m4/minloc0s.m4
@@ -45,7 +45,7 @@ FOREACH_FUNCTION(
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = count[n] + 1;
     }')
 
 MASKED_FOREACH_FUNCTION(
@@ -59,7 +59,7 @@ MASKED_FOREACH_FUNCTION(
     {
       minval = base;
       for (n = 0; n < rank; n++)
-        GFC_ARRAY_ELEM (index_type, dest, n * dspacing) = count[n] + 1;
+       GFC_ARRAY_ELEM (rtype_name, dest, n * dspacing) = count[n] + 1;
     }')
 
 SCALAR_FOREACH_FUNCTION(`0')

Reply via email to