From 9e6644c6fd3c9cf9f6a2fc6315052c953ab363cf Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Thu, 21 Feb 2019 18:01:41 +0000 Subject: re PR fortran/86119 (Intrinsic len has wrong type if used within select type for a class(*) string) 2019-02-21 Thomas Koenig PR fortran/86119 * class.c (gfc_get_len_component): Add argument k for kind. If the kind of the resulting expression is not equal to k, convert it. * gfortran.h (gfc_len_component): Adjust prototype. * simplify.c (gfc_simplify_len): Pass kind to gfc_get_len_component. 2019-02-21 Thomas Koenig PR fortran/86119 * gfortran.dg/warn_conversion_11.f90: New test. From-SVN: r269070 --- gcc/fortran/ChangeLog | 10 ++++++++++ gcc/fortran/class.c | 10 +++++++++- gcc/fortran/gfortran.h | 2 +- gcc/fortran/simplify.c | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dd2717c..f8df63d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2019-02-21 Thomas Koenig + + PR fortran/86119 + * class.c (gfc_get_len_component): Add argument k for kind. + If the kind of the resulting expression is not equal to k, + convert it. + * gfortran.h (gfc_len_component): Adjust prototype. + * simplify.c (gfc_simplify_len): Pass kind to + gfc_get_len_component. + 2019-02-20 Martin Liska * gfortran.texi: Change singular to plural. diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c index 6c6139b..bcbe631 100644 --- a/gcc/fortran/class.c +++ b/gcc/fortran/class.c @@ -565,7 +565,7 @@ gfc_intrinsic_hash_value (gfc_typespec *ts) ref to the _len component. */ gfc_expr * -gfc_get_len_component (gfc_expr *e) +gfc_get_len_component (gfc_expr *e, int k) { gfc_expr *ptr; gfc_ref *ref, **last; @@ -590,6 +590,14 @@ gfc_get_len_component (gfc_expr *e) } /* And replace if with a ref to the _len component. */ gfc_add_len_component (ptr); + if (k != ptr->ts.kind) + { + gfc_typespec ts; + gfc_clear_ts (&ts); + ts.type = BT_INTEGER; + ts.kind = k; + gfc_convert_type_warn (ptr, &ts, 2, 0); + } return ptr; } diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 526897c..6c4e839 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -3479,7 +3479,7 @@ bool gfc_is_class_scalar_expr (gfc_expr *); bool gfc_is_class_container_ref (gfc_expr *e); gfc_expr *gfc_class_initializer (gfc_typespec *, gfc_expr *); unsigned int gfc_hash_value (gfc_symbol *); -gfc_expr *gfc_get_len_component (gfc_expr *e); +gfc_expr *gfc_get_len_component (gfc_expr *e, int); bool gfc_build_class_symbol (gfc_typespec *, symbol_attribute *, gfc_array_spec **); gfc_symbol *gfc_find_derived_vtab (gfc_symbol *); diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 65059c8..fa6396b 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -4474,7 +4474,7 @@ gfc_simplify_len (gfc_expr *e, gfc_expr *kind) /* The expression in assoc->target points to a ref to the _data component of the unlimited polymorphic entity. To get the _len component the last _data ref needs to be stripped and a ref to the _len component added. */ - return gfc_get_len_component (e->symtree->n.sym->assoc->target); + return gfc_get_len_component (e->symtree->n.sym->assoc->target, k); else return NULL; } -- cgit v1.1