From 29d40637c45caf4b5ed5a9c4ce651a3623f13466 Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Wed, 30 Apr 2008 20:13:21 +0000 Subject: [PATCH] re PR fortran/35997 (Used function interface bug) 2008-04-30 Paul Thomas 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 PR fortran/35997 * gfortran.dg/use_rename_3.f90 From-SVN: r134836 --- gcc/fortran/ChangeLog | 6 ++++ gcc/fortran/module.c | 15 +++++++--- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gfortran.dg/use_rename_3.f90 | 35 ++++++++++++++++++++++ 4 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/use_rename_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 84e8f7b0128..13fb0528e55 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-04-28 Paul Thomas + + PR fortran/35997 + * module.c (find_symbol): Do not return a result for a symbol + that has been renamed in another module. + 2008-04-26 George Helffrich PR fortran/35892 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index bc45e9eb9c1..832f68698b4 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; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 410b7202cb8..ca56282f463 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-04-28 Paul Thomas + + PR fortran/35997 + * gfortran.dg/use_rename_3.f90 + 2008-04-30 Richard Guenther PR tree-optimization/21636 diff --git a/gcc/testsuite/gfortran.dg/use_rename_3.f90 b/gcc/testsuite/gfortran.dg/use_rename_3.f90 new file mode 100644 index 00000000000..9f28e2ee70e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/use_rename_3.f90 @@ -0,0 +1,35 @@ +! { dg-do compile } +! Tests the fix for PR35997, in which the use association of renamed +! valid2 and flag2 was treated as if the renaming were done on use +! association in the main program. Thus, the following, direct use +! association of valid and flag did not occur. +! +! Contributed by Drew McCormack +! +module funcinterfacemod + interface + logical function valid () + end function + end interface + logical :: flag = .true. +end module + +module secondmod + use funcinterfacemod, valid2 => valid, flag2 => flag +end module + +logical function valid () + valid = .true. +end function + +program main + use secondmod + use funcinterfacemod + if (valid ()) then + print *, 'Is Valid' + endif + if (flag) then + print *, 'Is flag' + endif +end program +! { dg-final { cleanup-modules "funcinterfacemod secondmod" } } -- 2.30.2