diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2011-06-27 22:59:12 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2011-06-27 22:59:12 +0200 |
| commit | dbb7247b9a209ac3afef3c5174ba552c1f941bec (patch) | |
| tree | b0d8e98279bfeac6c3b975fee2ba9fbbd2b62c6c /gcc/fortran/trans-array.c | |
| parent | 5d8d1543f583eb26342b90bae27fe099062d6be4 (diff) | |
| download | gcc-dbb7247b9a209ac3afef3c5174ba552c1f941bec.zip gcc-dbb7247b9a209ac3afef3c5174ba552c1f941bec.tar.gz gcc-dbb7247b9a209ac3afef3c5174ba552c1f941bec.tar.bz2 | |
re PR fortran/49466 (Memory leak with assignment of extended derived types)
2011-06-27 Janus Weil <janus@gcc.gnu.org>
PR fortran/49466
* trans-array.c (structure_alloc_comps): Make sure sub-components
and extended types are correctly deallocated.
2011-06-27 Janus Weil <janus@gcc.gnu.org>
PR fortran/49466
* gfortran.dg/allocatable_scalar_9.f90: Modified.
* gfortran.dg/extends_14.f03: Modified.
From-SVN: r175563
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index baf9060..408b73a 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6682,18 +6682,22 @@ structure_alloc_comps (gfc_symbol * der_type, tree decl, switch (purpose) { case DEALLOCATE_ALLOC_COMP: + if (cmp_has_alloc_comps && !c->attr.pointer) + { + /* Do not deallocate the components of ultimate pointer + components. */ + comp = fold_build3_loc (input_location, COMPONENT_REF, ctype, + decl, cdecl, NULL_TREE); + rank = c->as ? c->as->rank : 0; + tmp = structure_alloc_comps (c->ts.u.derived, comp, NULL_TREE, + rank, purpose); + gfc_add_expr_to_block (&fnblock, tmp); + } + if (c->attr.allocatable && c->attr.dimension) { comp = fold_build3_loc (input_location, COMPONENT_REF, ctype, decl, cdecl, NULL_TREE); - if (cmp_has_alloc_comps && !c->attr.pointer) - { - /* Do not deallocate the components of ultimate pointer - components. */ - tmp = structure_alloc_comps (c->ts.u.derived, comp, NULL_TREE, - c->as->rank, purpose); - gfc_add_expr_to_block (&fnblock, tmp); - } tmp = gfc_trans_dealloc_allocated (comp); gfc_add_expr_to_block (&fnblock, tmp); } |