From 2e49964fd8691ca13e33df656da7fc4b27c1a77b Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sat, 12 Mar 2011 17:58:33 +0100 Subject: re PR fortran/48059 ([OOP] ICE in in gfc_conv_component_ref: character function of extended type) 2011-03-12 Janus Weil PR fortran/48059 * trans-expr.c (gfc_apply_interface_mapping_to_expr): Replace base type for polymorphic arguments. 2011-03-12 Janus Weil PR fortran/48059 * gfortran.dg/class_41.f03: New. From-SVN: r170906 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-expr.c | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ac95f2a..503b7b8 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-03-12 Janus Weil + + PR fortran/48059 + * trans-expr.c (gfc_apply_interface_mapping_to_expr): Replace base type + for polymorphic arguments. + 2011-03-12 Francois-Xavier Coudert PR fortran/48054 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index d6c1f9f..da7cfba 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2247,6 +2247,10 @@ gfc_apply_interface_mapping_to_expr (gfc_interface_mapping * mapping, expr->symtree = sym->new_sym; else if (sym->expr) gfc_replace_expr (expr, gfc_copy_expr (sym->expr)); + /* Replace base type for polymorphic arguments. */ + if (expr->ref && expr->ref->type == REF_COMPONENT + && sym->expr && sym->expr->ts.type == BT_CLASS) + expr->ref->u.c.sym = sym->expr->ts.u.derived; } /* ...and to subexpressions in expr->value. */ -- cgit v1.1