diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2017-03-18 12:38:02 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2017-03-18 12:38:02 +0000 |
| commit | 91d2c04ced3420fdbfb5277336b6f4e164ca9f06 (patch) | |
| tree | 03b723c0931642c3551a0ea6b0b5a91a10b888cc /gcc/fortran/module.c | |
| parent | c7e4107b537c31cbbd22720935073bb4787e9773 (diff) | |
| download | gcc-91d2c04ced3420fdbfb5277336b6f4e164ca9f06.zip gcc-91d2c04ced3420fdbfb5277336b6f4e164ca9f06.tar.gz gcc-91d2c04ced3420fdbfb5277336b6f4e164ca9f06.tar.bz2 | |
re PR fortran/79676 ([submodules] Compilation/linking error when module procedures PRIVATE)
2017-03-18 Paul Thomas <pault@gcc.gnu.org>
PR fortran/79676
* module.c (mio_symbol_attribute): Remove reset of the flag
'no_module_procedures'.
(check_for_module_procedures): New function. Move declaration
of 'no_module_procedures' to above it.
(gfc_dump_module): Traverse namespace calling new function.
2017-03-18 Paul Thomas <pault@gcc.gnu.org>
PR fortran/79676
* gfortran.dg/submodule_28.f08 : New test.
From-SVN: r246256
Diffstat (limited to 'gcc/fortran/module.c')
| -rw-r--r-- | gcc/fortran/module.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 5515fed..80a6524 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -193,10 +193,6 @@ 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. */ @@ -2243,10 +2239,7 @@ 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; - } if (attr->oacc_declare_create) MIO_NAME (ab_attribute) (AB_OACC_DECLARE_CREATE, attr_bits); if (attr->oacc_declare_copyin) @@ -6139,6 +6132,18 @@ dump_module (const char *name, int dump_flag) } +/* Suppress the output of a .smod file by module, if no module + procedures have been seen. */ +static bool no_module_procedures; + +static void +check_for_module_procedures (gfc_symbol *sym) +{ + if (sym && sym->attr.module_procedure) + no_module_procedures = false; +} + + void gfc_dump_module (const char *name, int dump_flag) { @@ -6148,6 +6153,8 @@ gfc_dump_module (const char *name, int dump_flag) dump_smod =false; no_module_procedures = true; + gfc_traverse_ns (gfc_current_ns, check_for_module_procedures); + dump_module (name, dump_flag); if (no_module_procedures || dump_smod) |