diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3b290ac590e..5d59c8920ac 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-12-06 Paul Thomas + + PR fortran/34435 + * module.c (find_symbol): Do not return symtrees with unique + names, which shows that they are private. + 2007-12-05 Jakub Jelinek PR debug/33739 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index af81c3aee7c..c48bc68f9b2 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -3153,7 +3153,8 @@ find_symbol (gfc_symtree *st, const char *name, c = strcmp (name, st->n.sym->name); if (c == 0 && st->n.sym->module - && strcmp (module, st->n.sym->module) == 0) + && 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)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f2fcadb58c2..b19a4482915 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Paul Thomas + + PR fortran/34435 + * gfortran.dg/used_types_19.f90: New test. + 2007-12-06 Kaz Kojima * gfortran.dg/nan_2.f90: Add -mieee for sh. diff --git a/gcc/testsuite/gfortran.dg/used_types_19.f90 b/gcc/testsuite/gfortran.dg/used_types_19.f90 new file mode 100644 index 00000000000..dbec8dc1c8e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/used_types_19.f90 @@ -0,0 +1,26 @@ +! { dg-do compile } +! Tests the fix for PR34335 a regression in which the PRIVATE attribute +! of type(a) in module b would be ignored and would prevent it being +! loaded in the main program. +! +! Contributed by Janus Weil +! +module A + type A_type + real comp + end type +end module A + +module B + use A + private + type(A_type) :: B_var + public:: B_var +end module B + +program C + use B + use A + type(A_type):: A_var +end program C +! { dg-final { cleanup-modules "a b" } }