From 9dd8004e9108e08d45b25781bc6d44a624f690b8 Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Wed, 17 Jan 2007 17:33:35 +0000 Subject: re PR fortran/30476 ([Regression 4.2, 4.3] Via other module imported generic interface rejected) 2007-01-17 Paul Thomas PR fortran/30476 * module.c (load_generic_interfaces): Make the marking of the symbol as ambiguous conditional on the module names being different. (write_generic): Ensure that the generic interface has a non-NULL module field. 2007-01-17 Paul Thomas PR fortran/30476 * gfortran.dg/generic_12.f90: New test. From-SVN: r120860 --- gcc/fortran/ChangeLog | 9 +++++++++ gcc/fortran/module.c | 9 +++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/generic_12.f90 | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/generic_12.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index cba3de8..9dcead3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2007-01-17 Paul Thomas + + PR fortran/30476 + * module.c (load_generic_interfaces): Make the marking of the + symbol as ambiguous conditional on the module names being + different. + (write_generic): Ensure that the generic interface has a + non-NULL module field. + 2007-01-16 Roger Sayle PR fortran/30404 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 05056a5..1613a74 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -3097,9 +3097,11 @@ load_generic_interfaces (void) gfc_symtree *st; p = p ? p : name; st = gfc_find_symtree (gfc_current_ns->sym_root, p); - st->ambiguous = sym->attr.generic ? 0 : 1; + if (!sym->attr.generic + && sym->module != NULL + && strcmp(module, sym->module) != 0) + st->ambiguous = 1; } - if (i == 1) { mio_interface_rest (&sym->generic); @@ -3748,6 +3750,9 @@ write_generic (gfc_symbol * sym) || !gfc_check_access (sym->attr.access, sym->ns->default_access)) return; + if (sym->module == NULL) + sym->module = gfc_get_string (module_name); + mio_symbol_interface (&sym->name, &sym->module, &sym->generic); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b8072de..e5724ae 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-01-17 Paul Thomas + + PR fortran/30476 + * gfortran.dg/generic_12.f90: New test. + 2007-01-17 Dorit Nuzman * gcc.target/i386/vectorize1.c: Add cleanup-tree-dump. diff --git a/gcc/testsuite/gfortran.dg/generic_12.f90 b/gcc/testsuite/gfortran.dg/generic_12.f90 new file mode 100644 index 0000000..59c3c96 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/generic_12.f90 @@ -0,0 +1,32 @@ +! { dg-do compile } +! Test the fix for PR30476 in which the generic interface hello +! was found incorrectly to be ambiguous. +! +!Contributed by Tobias Burnus +! +SUBROUTINE hello_x(dum) + IMPLICIT NONE + INTEGER :: dum + WRITE(0,*) "Hello world: ", dum +END SUBROUTINE hello_x + +MODULE interfaces +IMPLICIT NONE +INTERFACE hello + SUBROUTINE hello_x(dum) + IMPLICIT NONE + INTEGER :: dum + END SUBROUTINE hello_x +END INTERFACE +END MODULE interfaces + +MODULE global_module + USE interfaces +END MODULE global_module + +PROGRAM main + USE global_module + IMPLICIT NONE + CALL hello(10) +END PROGRAM main +! { dg-final { cleanup-modules "interfaces global_module" } } -- cgit v1.1