diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2010-10-26 19:38:42 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2010-10-26 19:38:42 +0200 |
| commit | 2c80712872be90ceda8afb904e3b1f8d6501d070 (patch) | |
| tree | 94b46a9fc603f6f0d3a211f16ef784d84c96bfaf /gcc/fortran/trans-decl.c | |
| parent | 530f3a1bf62964c0c52d6fcf4ca0d321ce9d5156 (diff) | |
| download | gcc-2c80712872be90ceda8afb904e3b1f8d6501d070.zip gcc-2c80712872be90ceda8afb904e3b1f8d6501d070.tar.gz gcc-2c80712872be90ceda8afb904e3b1f8d6501d070.tar.bz2 | |
re PR fortran/42647 ([F03] Missed initialization/dealloc of allocatable scalar DT with allocatable component)
2010-10-26 Janus Weil <janus@gcc.gnu.org>
PR fortran/42647
* trans.h (gfc_deallocate_scalar_with_status): New prototype.
* trans.c (gfc_deallocate_scalar_with_status): New function for
deallocation of allocatable scalars.
* trans-array.c (structure_alloc_comps): Call it here ...
* trans-decl.c (gfc_trans_deferred_vars): ... here ...
* trans-stmt.c (gfc_trans_deallocate): ... and here.
2010-10-26 Janus Weil <janus@gcc.gnu.org>
PR fortran/42647
* gfortran.dg/allocatable_scalar_9.f90: Extended.
* gfortran.dg/allocatable_scalar_10.f90: New.
* gfortran.dg/class_19.f03: Extended.
From-SVN: r165973
Diffstat (limited to 'gcc/fortran/trans-decl.c')
| -rw-r--r-- | gcc/fortran/trans-decl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index f2905cd..2c4ebbb 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -3408,10 +3408,11 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) /* Deallocate when leaving the scope. Nullifying is not needed. */ - tmp = NULL; if (!sym->attr.result) - tmp = gfc_deallocate_with_status (se.expr, NULL_TREE, - true, NULL); + tmp = gfc_deallocate_scalar_with_status (se.expr, NULL, true, + NULL, sym->ts); + else + tmp = NULL; gfc_add_init_cleanup (block, gfc_finish_block (&init), tmp); } } |