diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2015-09-17 09:09:34 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2015-09-17 09:09:34 +0000 |
| commit | e3b5d7bae1c9cc9bd1faa905c0526dce2ee90924 (patch) | |
| tree | a7c286c611bf842796a367c55951cec6af9a1761 /gcc/fortran/module.c | |
| parent | fb0f04feaa6710087d04a5214394bd468d983a6b (diff) | |
| download | gcc-e3b5d7bae1c9cc9bd1faa905c0526dce2ee90924.zip gcc-e3b5d7bae1c9cc9bd1faa905c0526dce2ee90924.tar.gz gcc-e3b5d7bae1c9cc9bd1faa905c0526dce2ee90924.tar.bz2 | |
re PR fortran/52846 ([F2008] Support submodules)
2015-09-17 Paul Thomas <pault@gcc.gnu.org>
PR fortran/52846
PR fortran/67588
* module.c : Add static no_module_procedures.
(gfc_match_submodule): Correct memory leakage caused during the
freeing of use_lists.
(mio_symbol_attribute): Reset above if module procedure is
encountered.
(gfc_dump_module): Set above and exit without writing smod file
if it reset.
* gfortran.texi : Add section on submodule support.
2015-09-17 Paul Thomas <pault@gcc.gnu.org>
PR fortran/52846
* gfortran.dg/public_private_module_5.f90: Add module procedure
trigger_smod to ensure that the smod file is written.
From-SVN: r227855
Diffstat (limited to 'gcc/fortran/module.c')
| -rw-r--r-- | gcc/fortran/module.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index d88969e..f0d84a4 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -193,6 +193,11 @@ static gzFile module_fp; static const char *module_name; /* The name of the .smod file that the submodule will write to. */ static const char *submodule_name; + +/* Suppress the output of a .smod file by module, if no module + procedures have been seen. */ +static bool no_module_procedures; + static gfc_use_list *module_list; /* If we're reading an intrinsic module, this is its ID. */ @@ -798,7 +803,7 @@ gfc_match_submodule (void) /* Just retain the ultimate .(s)mod file for reading, since it contains all the information in its ancestors. */ use_list = module_list; - for (; module_list->next; use_list = use_list->next) + for (; module_list->next; use_list = module_list) { module_list = use_list->next; free (use_list); @@ -2222,7 +2227,10 @@ mio_symbol_attribute (symbol_attribute *attr) if (attr->array_outer_dependency) MIO_NAME (ab_attribute) (AB_ARRAY_OUTER_DEPENDENCY, attr_bits); if (attr->module_procedure) + { MIO_NAME (ab_attribute) (AB_MODULE_PROCEDURE, attr_bits); + no_module_procedures = false; + } mio_rparen (); @@ -6081,9 +6089,10 @@ gfc_dump_module (const char *name, int dump_flag) else dump_smod =false; + no_module_procedures = true; dump_module (name, dump_flag); - if (dump_smod) + if (no_module_procedures || dump_smod) return; /* Write a submodule file from a module. The 'dump_smod' flag switches |