FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/47474 (Wrong code with allocatable scalar, allocatable components as function result)

Browse source 
2011-01-27  Tobias Burnus  <burnus@net-b.de>

        PR fortran/47474
        * trans-decl.c (gfc_generate_function_code): Fix init
        of allocatable result variable with allocatable components.

From-SVN: r169340
This commit is contained in:
Tobias Burnus 2011-01-27 23:47:08 +01:00 • committed by Tobias Burnus
parent 2887665c94
commit f18694de28
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View file

@ -1,3 +1,9 @@
2011-01-27 Tobias Burnus <burnus@net-b.de>
PR fortran/47474
* trans-decl.c (gfc_generate_function_code): Fix init
of allocatable result variable with allocatable components.
2011-01-27 Tobias Burnus <burnus@net-b.de>
PR fortran/47472

12
gcc/fortran/trans-decl.c
View file

@ -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)