Dear Fortranners,
scalariziation of the elemental intrinsic LEN_TRIM was ICEing
when the optional KIND argument was present.
The cleanest solution is to use the infrastructure added by
Mikael's fix for PR97896. In that case it is a 1-liner. :-)
That fix is available on mainline and on 11-branch only, though.
My suggestion is to fix the current PR only for the same branches,
leaving the regression unfixed for older ones.
Regtested on x86_64-pc-linux-gnu. OK for mainline and 11-branch?
Thanks,
Harald
From f700c43fef4a239af25dd30dc22930b1bb1dbe95 Mon Sep 17 00:00:00 2001
From: Harald Anlauf <anl...@gmx.de>
Date: Fri, 19 Nov 2021 20:20:44 +0100
Subject: [PATCH] Fortran: fix scalarization for intrinsic LEN_TRIM with
present KIND argument
gcc/fortran/ChangeLog:
PR fortran/87851
* trans-array.c (arg_evaluated_for_scalarization): Add LEN_TRIM to
list of intrinsics for which an optional KIND argument needs to be
removed before scalarization.
gcc/testsuite/ChangeLog:
PR fortran/87851
* gfortran.dg/len_trim.f90: New test.
---
gcc/fortran/trans-array.c | 1 +
gcc/testsuite/gfortran.dg/len_trim.f90 | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 gcc/testsuite/gfortran.dg/len_trim.f90
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 2090adf01e7..238b1b72385 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -11499,6 +11499,7 @@ arg_evaluated_for_scalarization (gfc_intrinsic_sym *function,
switch (function->id)
{
case GFC_ISYM_INDEX:
+ case GFC_ISYM_LEN_TRIM:
if (strcmp ("kind", gfc_dummy_arg_get_name (*dummy_arg)) == 0)
return false;
/* Fallthrough. */
diff --git a/gcc/testsuite/gfortran.dg/len_trim.f90 b/gcc/testsuite/gfortran.dg/len_trim.f90
new file mode 100644
index 00000000000..63f803960d5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/len_trim.f90
@@ -0,0 +1,26 @@
+! { dg-do compile }
+! { dg-options "-O -Wall -Wconversion-extra -fdump-tree-original" }
+! { dg-final { scan-tree-dump-not "_gfortran_stop_numeric" "original" } }
+! PR fortran/87851 - return type for len_trim
+
+program main
+ implicit none
+ character(3), parameter :: a(1) = 'aa'
+ character(3) :: b = "bb"
+ character(3) :: c(1) = 'cc'
+ integer(4), parameter :: l4(1) = len_trim (a, kind=4)
+ integer(8), parameter :: l8(1) = len_trim (a, kind=8)
+ integer :: kk(1) = len_trim (a)
+ integer(4) :: mm(1) = len_trim (a, kind=4)
+ integer(8) :: nn(1) = len_trim (a, kind=8)
+ kk = len_trim (a)
+ mm = len_trim (a, kind=4)
+ nn = len_trim (a, kind=8)
+ kk = len_trim ([b])
+ mm = len_trim ([b],kind=4)
+ nn = len_trim ([b],kind=8)
+ kk = len_trim (c)
+ mm = len_trim (c, kind=4)
+ nn = len_trim (c, kind=8)
+ if (any (l4 /= 2_4) .or. any (l8 /= 2_8)) stop 1
+end program main
--
2.26.2
