diff options
| author | lkrupp <lkrupp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-06 23:47:18 +0000 |
|---|---|---|
| committer | lkrupp <lkrupp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-06 23:47:18 +0000 |
| commit | 0ac42026e76434ce0a3837ec6af99266ffad49a9 (patch) | |
| tree | 284a952dbaa2d667bb8889bd480e3f2c06d5415a /gcc/fortran/resolve.c | |
| parent | 5341cfc83b24a8b14f0a23a30df1e6dbd9c218bf (diff) | |
2015-10-06 Louis Krupp <louis.krupp@zoho.com>
PR fortran/65766
* resolve.c (gfc_resolve_substring_charlen): For derived type,
use typespec of string component when resolving substring length.
2015-10-06 Louis Krupp <louis.krupp@zoho.com>
PR fortran/65766
* gfortran.dg/substr_alloc_string_comp_1.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228551 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index e75c2930228..50b5c1d2a33 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4543,10 +4543,15 @@ gfc_resolve_substring_charlen (gfc_expr *e) { gfc_ref *char_ref; gfc_expr *start, *end; + gfc_typespec *ts = NULL; for (char_ref = e->ref; char_ref; char_ref = char_ref->next) - if (char_ref->type == REF_SUBSTRING) - break; + { + if (char_ref->type == REF_SUBSTRING) + break; + if (char_ref->type == REF_COMPONENT) + ts = &char_ref->u.c.component->ts; + } if (!char_ref) return; @@ -4576,7 +4581,11 @@ gfc_resolve_substring_charlen (gfc_expr *e) if (char_ref->u.ss.end) end = gfc_copy_expr (char_ref->u.ss.end); else if (e->expr_type == EXPR_VARIABLE) - end = gfc_copy_expr (e->symtree->n.sym->ts.u.cl->length); + { + if (!ts) + ts = &e->symtree->n.sym->ts; + end = gfc_copy_expr (ts->u.cl->length); + } else end = NULL; |