aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-expr.c
diff options
context:
space:
mode:
authorDominique d'Humieres <dominiq@lps.ens.fr>2014-06-10 13:42:38 +0200
committerDominique d'Humieres <dominiq@gcc.gnu.org>2014-06-10 13:42:38 +0200
commit5933f9ae4f8d7b9dec44ec95e70fcc543a616839 (patch)
tree2441a277b636ff7fa134f35b5860ed41ba4af0ec /gcc/fortran/trans-expr.c
parent5625721fbbf403e891fd6988bdf62fa0ad24c6be (diff)
downloadgcc-5933f9ae4f8d7b9dec44ec95e70fcc543a616839.zip
gcc-5933f9ae4f8d7b9dec44ec95e70fcc543a616839.tar.gz
gcc-5933f9ae4f8d7b9dec44ec95e70fcc543a616839.tar.bz2
re PR fortran/41936 (Memory leakage with allocatables and user-defined operators)
2014-06-10 Dominique d'Humieres <dominiq@lps.ens.fr> Mikael Morin <mikael@gcc.gnu.org> PR fortran/41936 gcc/fortran/ * trans-expr.c (gfc_conv_expr_reference): Deallocate array components. gcc/testsuite/ * gfortran.dg/class_array_15.f03: Check memory leaks. Co-Authored-By: Mikael Morin <mikael@gcc.gnu.org> From-SVN: r211405
Diffstat (limited to 'gcc/fortran/trans-expr.c')
-rw-r--r--gcc/fortran/trans-expr.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 5a50122..5338b09 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -6506,6 +6506,20 @@ gfc_conv_expr_reference (gfc_se * se, gfc_expr * expr)
/* Take the address of that value. */
se->expr = gfc_build_addr_expr (NULL_TREE, var);
+ if (expr->ts.type == BT_DERIVED && expr->rank
+ && !gfc_is_finalizable (expr->ts.u.derived, NULL)
+ && expr->ts.u.derived->attr.alloc_comp
+ && expr->expr_type != EXPR_VARIABLE)
+ {
+ tree tmp;
+
+ tmp = build_fold_indirect_ref_loc (input_location, se->expr);
+ tmp = gfc_deallocate_alloc_comp (expr->ts.u.derived, tmp, expr->rank);
+
+ /* The components shall be deallocated before
+ their containing entity. */
+ gfc_prepend_expr_to_block (&se->post, tmp);
+ }
}