diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2017-05-16 20:09:02 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2017-05-16 20:09:02 +0000 |
| commit | bedee914ca77688f4c2d9138216b3a3b84fbb619 (patch) | |
| tree | 54fdb50929f1ca700c25969ca92f586ec22061bb /gcc/fortran/decl.c | |
| parent | 10791753c191d1f9d886e8977ff331b28d48398d (diff) | |
| download | gcc-bedee914ca77688f4c2d9138216b3a3b84fbb619.zip gcc-bedee914ca77688f4c2d9138216b3a3b84fbb619.tar.gz gcc-bedee914ca77688f4c2d9138216b3a3b84fbb619.tar.bz2 | |
re PR fortran/80554 ([f08] variable redefinition in submodule)
2017-05-16 Paul Thomas <pault@gcc.gnu.org>
PR fortran/80554
* decl.c (build_sym): In a submodule allow overriding of host
associated symbols from the ancestor module with a new
declaration.
2017-05-16 Paul Thomas <pault@gcc.gnu.org>
PR fortran/80554
* gfortran.dg/submodule_29.f08: New test.
From-SVN: r248129
Diffstat (limited to 'gcc/fortran/decl.c')
| -rw-r--r-- | gcc/fortran/decl.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 5ca664e..1cbf238 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1383,8 +1383,28 @@ build_sym (const char *name, gfc_charlen *cl, bool cl_deferred, symbol_attribute attr; gfc_symbol *sym; int upper; + gfc_symtree *st; - if (gfc_get_symbol (name, NULL, &sym)) + /* Symbols in a submodule are host associated from the parent module or + submodules. Therefore, they can be overridden by declarations in the + submodule scope. Deal with this by attaching the existing symbol to + a new symtree and recycling the old symtree with a new symbol... */ + st = gfc_find_symtree (gfc_current_ns->sym_root, name); + if (st != NULL && gfc_state_stack->state == COMP_SUBMODULE + && st->n.sym != NULL + && st->n.sym->attr.host_assoc && st->n.sym->attr.used_in_submodule) + { + gfc_symtree *s = gfc_get_unique_symtree (gfc_current_ns); + s->n.sym = st->n.sym; + sym = gfc_new_symbol (name, gfc_current_ns); + + + st->n.sym = sym; + sym->refs++; + gfc_set_sym_referenced (sym); + } + /* ...Otherwise generate a new symtree and new symbol. */ + else if (gfc_get_symbol (name, NULL, &sym)) return false; /* Check if the name has already been defined as a type. The |