From f18694de283e54954b2012ffb66c2580e9ffd233 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Thu, 27 Jan 2011 23:47:08 +0100 Subject: [PATCH] re PR fortran/47474 (Wrong code with allocatable scalar, allocatable components as function result) 2011-01-27 Tobias Burnus PR fortran/47474 * trans-decl.c (gfc_generate_function_code): Fix init of allocatable result variable with allocatable components. From-SVN: r169340 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-decl.c | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 263617079bf..f5380cd511f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-01-27 Tobias Burnus + + PR fortran/47474 + * trans-decl.c (gfc_generate_function_code): Fix init + of allocatable result variable with allocatable components. + 2011-01-27 Tobias Burnus PR fortran/47472 diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 5e3afbe8219..74de59ea384 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -4602,16 +4602,18 @@ gfc_generate_function_code (gfc_namespace * ns) && sym->attr.function && !sym->attr.pointer) { - if (sym->ts.type == BT_DERIVED - && sym->ts.u.derived->attr.alloc_comp) + if (sym->attr.allocatable && sym->attr.dimension == 0 + && sym->result == sym) + gfc_add_modify (&init, result, fold_convert (TREE_TYPE (result), + null_pointer_node)); + else if (sym->ts.type == BT_DERIVED + && sym->ts.u.derived->attr.alloc_comp + && !sym->attr.allocatable) { rank = sym->as ? sym->as->rank : 0; tmp = gfc_nullify_alloc_comp (sym->ts.u.derived, result, rank); gfc_add_expr_to_block (&init, tmp); } - else if (sym->attr.allocatable && sym->attr.dimension == 0) - gfc_add_modify (&init, result, fold_convert (TREE_TYPE (result), - null_pointer_node)); } if (result == NULL_TREE)