diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-06-21 21:51:41 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-06-21 21:51:41 +0000 |
| commit | 6b3ceb4e02f92a1610d592d468db1d53bd9e3985 (patch) | |
| tree | 8c497c9e3d7192b2eab61b4fc62363f866caa686 /gcc/fortran/trans-decl.c | |
| parent | be613ac94c0f27795f1e46ea77305527bf09fdf3 (diff) | |
| download | gcc-6b3ceb4e02f92a1610d592d468db1d53bd9e3985.tar.gz | |
2013-06-21 Tobias Burnus <burnus@net-b.de>
* trans-array.c (gfc_trans_deferred_array): Call the
finalizer for nonallocatable local variables.
* trans-decl.c (gfc_get_symbol_decl): Add local
finalizable vars to the deferred list.
(gfc_trans_deferred_vars): Call gfc_trans_deferred_array
for those.
2013-06-21 Tobias Burnus <burnus@net-b.de>
* gfortran.dg/finalize_17.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200321 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/trans-decl.c')
| -rw-r--r-- | gcc/fortran/trans-decl.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 4e3bf48f127..fc3a725aa3d 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -1420,7 +1420,11 @@ gfc_get_symbol_decl (gfc_symbol * sym) || (sym->ts.type == BT_CLASS && (CLASS_DATA (sym)->attr.dimension || CLASS_DATA (sym)->attr.allocatable)) - || (sym->ts.type == BT_DERIVED && sym->ts.u.derived->attr.alloc_comp) + || (sym->ts.type == BT_DERIVED + && (sym->ts.u.derived->attr.alloc_comp + || (!sym->attr.pointer && !sym->attr.artificial && !sym->attr.save + && !sym->ns->proc_name->attr.is_main_program + && gfc_is_finalizable (sym->ts.u.derived, NULL)))) /* This applies a derived type default initializer. */ || (sym->ts.type == BT_DERIVED && sym->attr.save == SAVE_NONE @@ -3668,8 +3672,10 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) for (sym = proc_sym->tlink; sym != proc_sym; sym = sym->tlink) { - bool sym_has_alloc_comp = (sym->ts.type == BT_DERIVED) - && sym->ts.u.derived->attr.alloc_comp; + bool alloc_comp_or_fini = (sym->ts.type == BT_DERIVED) + && (sym->ts.u.derived->attr.alloc_comp + || gfc_is_finalizable (sym->ts.u.derived, + NULL)); if (sym->assoc) continue; @@ -3754,7 +3760,7 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) gfc_save_backend_locus (&loc); gfc_set_backend_locus (&sym->declared_at); - if (sym_has_alloc_comp) + if (alloc_comp_or_fini) { seen_trans_deferred_array = true; gfc_trans_deferred_array (sym, block); @@ -3802,7 +3808,7 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) default: gcc_unreachable (); } - if (sym_has_alloc_comp && !seen_trans_deferred_array) + if (alloc_comp_or_fini && !seen_trans_deferred_array) gfc_trans_deferred_array (sym, block); } else if ((!sym->attr.dummy || sym->ts.deferred) @@ -3998,7 +4004,7 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) } else if (sym->ts.deferred) gfc_fatal_error ("Deferred type parameter not yet supported"); - else if (sym_has_alloc_comp) + else if (alloc_comp_or_fini) gfc_trans_deferred_array (sym, block); else if (sym->ts.type == BT_CHARACTER) { |