aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-intrinsic.c
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2020-10-04 20:24:29 +0200
committerHarald Anlauf <anlauf@gmx.de>2020-10-04 20:24:29 +0200
commit35d2c6b6e8a7448a84abbf967feeb78a29117014 (patch)
tree25db061b1843c6b8c520ace515a1d3df3f050350 /gcc/fortran/trans-intrinsic.c
parent11bd94806d488416dfad1b1ff2ff0f98001cd0ca (diff)
downloadgcc-35d2c6b6e8a7448a84abbf967feeb78a29117014.zip
gcc-35d2c6b6e8a7448a84abbf967feeb78a29117014.tar.gz
gcc-35d2c6b6e8a7448a84abbf967feeb78a29117014.tar.bz2
PR fortran/97272 - Wrong answer from MAXLOC with character arg
The optional KIND argument to the MINLOC/MAXLOC intrinsic must not be passed to the library function, as the kind conversion of the result is treated explicitly elsewhere. gcc/fortran/ChangeLog: PR fortran/97272 * trans-intrinsic.c (strip_kind_from_actual): Helper function for removal of KIND argument. (gfc_conv_intrinsic_minmaxloc): Ignore KIND argument here, as it is treated elsewhere. gcc/testsuite/ChangeLog: PR fortran/97272 * gfortran.dg/pr97272.f90: New test.
Diffstat (limited to 'gcc/fortran/trans-intrinsic.c')
-rw-r--r--gcc/fortran/trans-intrinsic.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 3b3bd86..8729bc1 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -5073,6 +5073,24 @@ gfc_conv_intrinsic_dot_product (gfc_se * se, gfc_expr * expr)
}
+/* Remove unneeded kind= argument from actual argument list when the
+ result conversion is dealt with in a different place. */
+
+static void
+strip_kind_from_actual (gfc_actual_arglist * actual)
+{
+ for (gfc_actual_arglist *a = actual; a; a = a->next)
+ {
+ gfc_actual_arglist *b = a->next;
+ if (b && b->name && strcmp (b->name, "kind") == 0)
+ {
+ a->next = b->next;
+ b->next = NULL;
+ gfc_free_actual_arglist (b);
+ }
+ }
+}
+
/* Emit code for minloc or maxloc intrinsic. There are many different cases
we need to handle. For performance reasons we sometimes create two
loops instead of one, where the second one is much simpler.
@@ -5208,6 +5226,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op)
{
gfc_actual_arglist *a, *b;
a = actual;
+ strip_kind_from_actual (a);
while (a->next)
{
b = a->next;