aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/module.c
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2008-04-30 20:13:21 +0000
committerPaul Thomas <pault@gcc.gnu.org>2008-04-30 20:13:21 +0000
commit29d40637c45caf4b5ed5a9c4ce651a3623f13466 (patch)
tree5eda8593c6924f553e42fef0fc3d4f1b0053a1f8 /gcc/fortran/module.c
parentad516a74de3fede4d52dcd3b8aeb65aa148e14e3 (diff)
downloadgcc-29d40637c45caf4b5ed5a9c4ce651a3623f13466.zip
gcc-29d40637c45caf4b5ed5a9c4ce651a3623f13466.tar.gz
gcc-29d40637c45caf4b5ed5a9c4ce651a3623f13466.tar.bz2
re PR fortran/35997 (Used function interface bug)
2008-04-30 Paul Thomas <pault@gcc.gnu.org> PR fortran/35997 * module.c (find_symbol): Do not return a result for a symbol that has been renamed in another module. 2008-04-30 Paul Thomas <pault@gcc.gnu.org> PR fortran/35997 * gfortran.dg/use_rename_3.f90 From-SVN: r134836
Diffstat (limited to 'gcc/fortran/module.c')
-rw-r--r--gcc/fortran/module.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index bc45e9e..832f686 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -3146,13 +3146,14 @@ find_symtree_for_symbol (gfc_symtree *st, gfc_symbol *sym)
/* A recursive function to look for a speficic symbol by name and by
module. Whilst several symtrees might point to one symbol, its
is sufficient for the purposes here than one exist. Note that
- generic interfaces are distinguished. */
+ generic interfaces are distinguished as are symbols that have been
+ renamed in another module. */
static gfc_symtree *
find_symbol (gfc_symtree *st, const char *name,
const char *module, int generic)
{
int c;
- gfc_symtree *retval;
+ gfc_symtree *retval, *s;
if (st == NULL || st->n.sym == NULL)
return NULL;
@@ -3162,8 +3163,14 @@ find_symbol (gfc_symtree *st, const char *name,
&& strcmp (module, st->n.sym->module) == 0
&& !check_unique_name (st->name))
{
- if ((!generic && !st->n.sym->attr.generic)
- || (generic && st->n.sym->attr.generic))
+ s = gfc_find_symtree (gfc_current_ns->sym_root, name);
+
+ /* Detect symbols that are renamed by use association in another
+ module by the absence of a symtree and null attr.use_rename,
+ since the latter is not transmitted in the module file. */
+ if (((!generic && !st->n.sym->attr.generic)
+ || (generic && st->n.sym->attr.generic))
+ && !(s == NULL && !st->n.sym->attr.use_rename))
return st;
}