re PR fortran/36313 ([F03] {MIN,MAX}{LOC,VAL} should accept character arguments)

2017-11-22  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/36313
	* Makefile.am: Add i_maxloc0s_c, i_maxloc1s_c, i_maxloc2s_c,
	i_minloc0s_c, i_minloc1s_c and i_minloc2s_c.
	* Makefile.in: Regenerated.
        * generated/maxloc0_16_s1.c: New file.
        * generated/maxloc0_16_s4.c: New file.
        * generated/maxloc0_4_s1.c: New file.
        * generated/maxloc0_4_s4.c: New file.
        * generated/maxloc0_8_s1.c: New file.
        * generated/maxloc0_8_s4.c: New file.
        * generated/maxloc1_16_s1.c: New file.
        * generated/maxloc1_16_s4.c: New file.
        * generated/maxloc1_4_s1.c: New file.
        * generated/maxloc1_4_s4.c: New file.
        * generated/maxloc1_8_s1.c: New file.
        * generated/maxloc1_8_s4.c: New file.
        * generated/maxloc2_16_s1.c: New file.
        * generated/maxloc2_16_s4.c: New file.
        * generated/maxloc2_4_s1.c: New file.
        * generated/maxloc2_4_s4.c: New file.
        * generated/maxloc2_8_s1.c: New file.
        * generated/maxloc2_8_s4.c: New file.
        * generated/minloc0_16_s1.c: New file.
        * generated/minloc0_16_s4.c: New file.
        * generated/minloc0_4_s1.c: New file.
        * generated/minloc0_4_s4.c: New file.
        * generated/minloc0_8_s1.c: New file.
        * generated/minloc0_8_s4.c: New file.
        * generated/minloc1_16_s1.c: New file.
        * generated/minloc1_16_s4.c: New file.
        * generated/minloc1_4_s1.c: New file.
        * generated/minloc1_4_s4.c: New file.
        * generated/minloc1_8_s1.c: New file.
        * generated/minloc1_8_s4.c: New file.
        * generated/minloc2_16_s1.c: New file.
        * generated/minloc2_16_s4.c: New file.
        * generated/minloc2_4_s1.c: New file.
        * generated/minloc2_4_s4.c: New file.
        * generated/minloc2_8_s1.c: New file.
        * generated/minloc2_8_s4.c: New file.
        * m4/iforeach-s.m4: New file.
        * m4/ifunction-s.m4: New file.
        * m4/maxloc0s.m4: New file.
        * m4/maxloc1s.m4: New file.
        * m4/maxloc2s.m4: New file.
        * m4/minloc0s.m4: New file.
        * m4/minloc1s.m4: New file.
        * m4/minloc2s.m4: New file.
	* gfortran.map: Add new functions.
	* libgfortran.h: Add gfc_array_s1 and gfc_array_s4.

2017-11-22  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/36313
	* check.c (int_or_real_or_char_check_f2003): New function.
	* iresolve.c (gfc_resolve_maxloc): Add number "2" for
	character arguments and rank-zero return value.
	(gfc_resolve_minloc): Likewise.
	* trans-intrinsic.c (gfc_conv_intrinsic_minmaxloc): Handle case of
	character arguments and rank-zero return value by removing
	unneeded arguments and calling the library function.

2017-11-22  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/36313
	* gfortran.dg/maxloc_string_1.f90: New test.
	* gfortran.dg/minloc_string_1.f90: New test.

From-SVN: r255070

1 files changed, 156 insertions, 0 deletions

diff --git a/libgfortran/generated/maxloc2_16_s4.c b/libgfortran/generated/maxloc2_16_s4.c
new file mode 100644
index 00000000000..327979000fc
--- /dev/null
+++ b/libgfortran/generated/maxloc2_16_s4.c
@@ -0,0 +1,156 @@
+/* Implementation of the MAXLOC intrinsic
+   Copyright 2017 Free Software Foundation, Inc.
+   Contributed by Thomas Koenig
+
+This file is part of the GNU Fortran runtime library (libgfortran).
+
+Libgfortran is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+
+Libgfortran is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+#include "libgfortran.h"
+#include <stdlib.h>
+#include <string.h>
+
+#if defined (HAVE_GFC_INTEGER_4) && defined (HAVE_GFC_INTEGER_16)
+
+static inline int
+compare_fcn (const GFC_INTEGER_4 *a, const GFC_INTEGER_4 *b, int n)
+{
+  if (sizeof (GFC_INTEGER_4) == 1)
+    return memcmp (a, b, n);
+  else
+    return memcmp_char4 (a, b, n);
+}
+
+extern GFC_INTEGER_16 maxloc2_16_s4 (gfc_array_s4 * const restrict, int);
+export_proto(maxloc2_16_s4);
+
+GFC_INTEGER_16
+maxloc2_16_s4 (gfc_array_s4 * const restrict array, gfc_charlen_type len)
+{
+  index_type ret;
+  index_type sstride;
+  index_type extent;
+  const GFC_INTEGER_4 *src;
+  const GFC_INTEGER_4 *maxval;
+  index_type i;
+
+  extent = GFC_DESCRIPTOR_EXTENT(array,0);
+  if (extent <= 0)
+    return 0;
+
+  sstride = GFC_DESCRIPTOR_STRIDE(array,0) * len;
+
+  ret = 1;
+  src = array->base_addr;
+  maxval = src;
+  for (i=2; i<=extent; i++)
+    {
+      src += sstride;
+      if (compare_fcn (src, maxval, len) > 0)
+      {
+	 ret = i;
+	 maxval = src;
+      }
+    }
+  return ret;
+}
+
+extern GFC_INTEGER_16 mmaxloc2_16_s4 (gfc_array_s4 * const restrict,
+       		    	gfc_array_l1 *const restrict mask, gfc_charlen_type);
+export_proto(mmaxloc2_16_s4);
+
+GFC_INTEGER_16
+mmaxloc2_16_s4 (gfc_array_s4 * const restrict array,
+				 gfc_array_l1 * const restrict mask,
+				 gfc_charlen_type len)
+{
+  index_type ret;
+  index_type sstride;
+  index_type extent;
+  const GFC_INTEGER_4 *src;
+  const GFC_INTEGER_4 *maxval;
+  index_type i, j;
+  GFC_LOGICAL_1 *mbase;
+  int mask_kind;
+  index_type mstride;
+
+  extent = GFC_DESCRIPTOR_EXTENT(array,0);
+  if (extent <= 0)
+    return 0;
+
+  sstride = GFC_DESCRIPTOR_STRIDE(array,0) * len;
+
+  mask_kind = GFC_DESCRIPTOR_SIZE (mask);
+  mbase = mask->base_addr;
+
+  if (mask_kind == 1 || mask_kind == 2 || mask_kind == 4 || mask_kind == 8
+#ifdef HAVE_GFC_LOGICAL_16
+      || mask_kind == 16
+#endif
+      )
+    mbase = GFOR_POINTER_TO_L1 (mbase, mask_kind);
+  else
+    internal_error (NULL, "Funny sized logical array");
+
+  mstride = GFC_DESCRIPTOR_STRIDE_BYTES(mask,0);
+
+  /* Search for the first occurrence of a true element in mask. */
+  for (j=0; j<extent; j++)
+    {
+      if (*mbase)
+        break;
+      mbase += mstride;
+    }
+
+  if (j == extent)
+    return 0;
+
+  ret = j + 1;
+  src = array->base_addr + j * sstride;
+  maxval = src;
+
+  for (i=j+1; i<=extent; i++)
+    {
+      if (*mbase && compare_fcn (src, maxval, len) > 0)
+      {
+	 ret = i;
+	 maxval = src;
+      }
+      src += sstride;
+      mbase += mstride;
+    }
+  return ret;
+}
+
+extern GFC_INTEGER_16 smaxloc2_16_s4 (gfc_array_s4 * const restrict,
+       		    	GFC_LOGICAL_4 *mask, int);
+export_proto(smaxloc2_16_s4);
+
+GFC_INTEGER_16
+smaxloc2_16_s4 (gfc_array_s4 * const restrict array,
+				 GFC_LOGICAL_4 *mask, gfc_charlen_type len)
+{
+  if (mask)
+    return maxloc2_16_s4 (array, len);
+  else
+    return 0;
+}
+
+#endif