diff options
| author | pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-30 19:35:14 +0000 |
|---|---|---|
| committer | pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-30 19:35:14 +0000 |
| commit | 83aeedb979b2d203e4135bb55fa0c07e5b250635 (patch) | |
| tree | 3d04f401d942074656d07f10c4252bef4c56ac37 /gcc/fortran/trans-decl.c | |
| parent | 951e5184fbf22661999a727e163cc17bfa5d6244 (diff) | |
| download | gcc-83aeedb979b2d203e4135bb55fa0c07e5b250635.tar.gz | |
2009-03-30 Paul Thomas <pault@gcc.gnu.org>
PR fortran/22571
PR fortran/26227
PR fortran/24886
* symbol.c : Add gfc_global_ns_list.
* decl.c (add_global_entry): Set the namespace ('ns') field.
* gfortran.h : Add the resolved field to gfc_namespace. Add the
namespace ('ns') field to gfc_gsymbol. Add flag_whole_file to
gfc_option_t. Add the prototype for gfc_free_dt_list.
* lang.opt : Add the whole-file option.
* invoke.texi : Document the whole-file option.
* resolve.c (resolve_global_procedure): If the fwhole-file
option is set, reorder gsymbols to ensure that translation is
in the right order. Resolve the gsymbol's namespace if that
has not occurred and then check interfaces.
(resolve_function): Move call to resolve_global_procedure.
(resolve_call): The same.
(resolve_codes): Store the current labels_obstack.
(gfc_resolve) : Return if the namespace is already resolved.
trans-decl.c (gfc_get_extern_function_decl): If the whole_file
option is selected, use the backend_decl of a gsymbol, if it is
available.
parse.c (add_global_procedure, add_global_program): If the flag
whole-file is set, add the namespace to the gsymbol.
(gfc_parse_file): On -fwhole-file, put procedure namespaces on
the global namespace list. Rearrange to do resolution of all
the procedures in a file, followed by their translation.
* options.c (gfc_init_options): Add -fwhole-file.
(gfc_handle_option): The same.
2009-03-30 Paul Thomas <pault@gcc.gnu.org>
PR fortran/22571
* gfortran.dg/whole_file_1.f90: New test.
PR fortran/26227
* gfortran.dg/whole_file_2.f90: New test.
* gfortran.dg/whole_file_3.f90: New test.
PR fortran/24886
* gfortran.dg/whole_file_4.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145314 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/trans-decl.c')
| -rw-r--r-- | gcc/fortran/trans-decl.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 6cfc86a4bb7..774f42078da 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -1221,6 +1221,7 @@ gfc_get_extern_function_decl (gfc_symbol * sym) char s[GFC_MAX_SYMBOL_LEN + 23]; /* "_gfortran_f2c_specific" and '\0'. */ tree name; tree mangled_name; + gfc_gsymbol *gsym; if (sym->backend_decl) return sym->backend_decl; @@ -1233,6 +1234,41 @@ gfc_get_extern_function_decl (gfc_symbol * sym) if (sym->attr.proc_pointer) return get_proc_pointer_decl (sym); + /* See if this is an external procedure from the same file. If so, + return the backend_decl. */ + gsym = gfc_find_gsymbol (gfc_gsym_root, sym->name); + + if (gfc_option.flag_whole_file + && !sym->backend_decl + && gsym && gsym->ns + && ((gsym->type == GSYM_SUBROUTINE) || (gsym->type == GSYM_FUNCTION)) + && gsym->ns->proc_name->backend_decl) + { + /* If the namespace has entries, the proc_name is the + entry master. Find the entry and use its backend_decl. + otherwise, use the proc_name backend_decl. */ + if (gsym->ns->entries) + { + gfc_entry_list *entry = gsym->ns->entries; + + for (; entry; entry = entry->next) + { + if (strcmp (gsym->name, entry->sym->name) == 0) + { + sym->backend_decl = entry->sym->backend_decl; + break; + } + } + } + else + { + sym->backend_decl = gsym->ns->proc_name->backend_decl; + } + + if (sym->backend_decl) + return sym->backend_decl; + } + if (sym->attr.intrinsic) { /* Call the resolution function to get the actual name. This is |