From: dominiq Date: Tue, 10 Jun 2014 11:42:38 +0000 (+0000) Subject: 2014-06-10 Dominique d'Humieres X-Git-Tag: upstream/5.3.0~7873 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4b8f841217f1f8c5ce7c4a0e472ce750e1fb2ac;p=platform%2Fupstream%2Flinaro-gcc.git 2014-06-10 Dominique d'Humieres Mikael Morin 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211405 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f945dd1..bdc102b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2014-06-10 Dominique d'Humieres + Mikael Morin + + PR fortran/41936 + * trans-expr.c (gfc_conv_expr_reference): Deallocate array + components. + 2014-06-10 Jakub Jelinek PR fortran/60928 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); + } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e86cb9b..175bbeb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-06-10 Dominique d'Humieres + Mikael Morin + + PR fortran/41936 + * gfortran.dg/class_array_15.f03: Check memory leaks. + 2014-06-10 Richard Biener PR tree-optimization/57186 diff --git a/gcc/testsuite/gfortran.dg/class_array_15.f03 b/gcc/testsuite/gfortran.dg/class_array_15.f03 index 7d1d4d7..d3a1232 100644 --- a/gcc/testsuite/gfortran.dg/class_array_15.f03 +++ b/gcc/testsuite/gfortran.dg/class_array_15.f03 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-fdump-tree-original" } ! ! Tests the fixes for three bugs with the same underlying cause. All are regressions ! that come about because class array elements end up with a different tree type @@ -114,3 +115,5 @@ subroutine pr54992 ! This test remains as the original. bh => bhGet(b,instance=2) if (loc (b) .ne. loc(bh%hostNode)) call abort end +! { dg-final { scan-tree-dump-times "builtin_free" 12 "original" } } +! { dg-final { cleanup-tree-dump "original" } }