From 8199eea14f1ab32d805cc4be98ecfb5424a78671 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Wed, 18 May 2011 20:51:08 +0200 Subject: [PATCH] re PR fortran/48700 (memory leak with MOVE_ALLOC) 2011-05-18 Janus Weil PR fortran/48700 * trans-intrinsic.c (gfc_conv_intrinsic_move_alloc): Deallocate 'TO' argument to avoid memory leaks. 2011-05-18 Janus Weil PR fortran/48700 * gfortran.dg/move_alloc_4.f90: New. From-SVN: r173874 --- gcc/fortran/trans-intrinsic.c | 15 ++++++++++++++- gcc/testsuite/gfortran.dg/move_alloc_4.f90 | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/move_alloc_4.f90 diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index fa5d3cfc5df..3cfaa0d4245 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -6958,15 +6958,28 @@ gfc_conv_intrinsic_move_alloc (gfc_code *code) if (code->ext.actual->expr->rank == 0) { /* Scalar arguments: Generate pointer assignments. */ - gfc_expr *from, *to; + gfc_expr *from, *to, *deal; stmtblock_t block; tree tmp; + gfc_se se; from = code->ext.actual->expr; to = code->ext.actual->next->expr; gfc_start_block (&block); + /* Deallocate 'TO' argument. */ + gfc_init_se (&se, NULL); + se.want_pointer = 1; + deal = gfc_copy_expr (to); + if (deal->ts.type == BT_CLASS) + gfc_add_data_component (deal); + gfc_conv_expr (&se, deal); + tmp = gfc_deallocate_scalar_with_status (se.expr, NULL, true, + deal, deal->ts); + gfc_add_expr_to_block (&block, tmp); + gfc_free_expr (deal); + if (to->ts.type == BT_CLASS) tmp = gfc_trans_class_assign (to, from, EXEC_POINTER_ASSIGN); else diff --git a/gcc/testsuite/gfortran.dg/move_alloc_4.f90 b/gcc/testsuite/gfortran.dg/move_alloc_4.f90 new file mode 100644 index 00000000000..1f5deed60fe --- /dev/null +++ b/gcc/testsuite/gfortran.dg/move_alloc_4.f90 @@ -0,0 +1,22 @@ +! { dg-do run } +! { dg-options "-fdump-tree-original" } +! +! PR 48700: memory leak with MOVE_ALLOC +! +! Contributed by Salvatore Filippone + +program testmv3 + type bar + integer, allocatable :: ia(:), ja(:) + end type + + type(bar), allocatable :: sm,sm2 + + allocate(sm) + allocate(sm%ia(10),sm%ja(10)) + + call move_alloc(sm2,sm) + +end program testmv3 + +! { dg-final { scan-tree-dump-times "__builtin_free" 9 "original" } } -- 2.30.2