From 3a7b9fdaf63436ea0c43acc53457495bd36791b7 Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Mon, 7 Jan 2008 16:44:43 +0000 Subject: [PATCH] re PR fortran/34672 (.mod file misses renamed, USEd symbol) 2008-01-07 Paul Thomas PR fortran/34672 * module.c (write_generic): Rewrite completely. (write_module): Change call to write_generic. 2008-01-07 Paul Thomas PR fortran/34672 * gfortran.dg/use_only_2.f90: New test. From-SVN: r131377 --- gcc/fortran/ChangeLog | 6 ++++ gcc/fortran/module.c | 35 ++++++++++-------------- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gfortran.dg/use_only_2.f90 | 30 ++++++++++++++++++++ 4 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/use_only_2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8b5694216b2..19f822f8378 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-01-07 Paul Thomas + + PR fortran/34672 + * module.c (write_generic): Rewrite completely. + (write_module): Change call to write_generic. + 2008-01-06 Jerry DeLisle PR fortran/34659 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 20528cbdc27..20cec83d984 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -4176,13 +4176,22 @@ write_operator (gfc_user_op *uop) } -/* Write generic interfaces associated with a symbol. */ +/* Write generic interfaces from the namespace sym_root. */ static void -write_generic (gfc_symbol *sym) +write_generic (gfc_symtree *st) { - const char *p; - int nuse, j; + gfc_symbol *sym; + + if (st == NULL) + return; + + write_generic (st->left); + write_generic (st->right); + + sym = st->n.sym; + if (!sym || check_unique_name (st->name)) + return; if (sym->generic == NULL || !gfc_check_access (sym->attr.access, sym->ns->default_access)) @@ -4191,21 +4200,7 @@ write_generic (gfc_symbol *sym) if (sym->module == NULL) sym->module = gfc_get_string (module_name); - /* See how many use names there are. If none, use the symbol name. */ - nuse = number_use_names (sym->name, false); - if (nuse == 0) - { - mio_symbol_interface (&sym->name, &sym->module, &sym->generic); - return; - } - - for (j = 1; j <= nuse; j++) - { - /* Get the jth local name for this symbol. */ - p = find_use_name_n (sym->name, &j, false); - - mio_symbol_interface (&p, &sym->module, &sym->generic); - } + mio_symbol_interface (&st->name, &sym->module, &sym->generic); } @@ -4263,7 +4258,7 @@ write_module (void) write_char ('\n'); mio_lparen (); - gfc_traverse_ns (gfc_current_ns, write_generic); + write_generic (gfc_current_ns->sym_root); mio_rparen (); write_char ('\n'); write_char ('\n'); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0a0db6b7b65..ee0d67332ef 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-01-07 Paul Thomas + + PR fortran/34672 + * gfortran.dg/use_only_2.f90: New test. + 2008-01-06 Paolo Carlini PR libstdc++/34680 diff --git a/gcc/testsuite/gfortran.dg/use_only_2.f90 b/gcc/testsuite/gfortran.dg/use_only_2.f90 new file mode 100644 index 00000000000..313953ec8bb --- /dev/null +++ b/gcc/testsuite/gfortran.dg/use_only_2.f90 @@ -0,0 +1,30 @@ +! { dg-do compile } +! Checks the fix for PR34672, in which generic interfaces were not +! being written correctly, when renamed. +! +! Contributed by Jos de Kloe +! +MODULE MyMod1 + integer, parameter :: i2_ = Selected_Int_Kind(4) +END Module MyMod1 + +module MyMod2 + INTERFACE write_int + module procedure write_int_local + END INTERFACE +contains + subroutine write_int_local(value) + integer, intent(in) :: value + print *,value + end subroutine write_int_local +end module MyMod2 + +module MyMod3 + USE MyMod2, only: write_MyInt => write_int + USE MyMod1, only: i2_ +end module MyMod3 + +module MyMod4 + USE MyMod3, only: write_MyInt +end module MYMOD4 +! { dg-final { cleanup-modules "MyMod1 MyMod2 MyMod3 MyMod4" } } -- 2.30.2