From 8b0e883501b45c7240394bae2cc694482291a2ea Mon Sep 17 00:00:00 2001 From: hjl Date: Sun, 19 Feb 2006 18:03:52 +0000 Subject: [PATCH 1/1] 2006-02-19 H.J. Lu * resolve.c (resolve_contained_functions): Call resolve_entries first. (resolve_types): Remove calls to resolve_entries and resolve_contained_functions. (gfc_resolve): Call resolve_contained_functions. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111271 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 8 ++++++++ gcc/fortran/resolve.c | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7ef520553ed..6a15a1abf85 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2006-02-19 H.J. Lu + + * resolve.c (resolve_contained_functions): Call resolve_entries + first. + (resolve_types): Remove calls to resolve_entries and + resolve_contained_functions. + (gfc_resolve): Call resolve_contained_functions. + 2006-02-19 Erik Edelmann PR fortran/26201 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 63b2cd9904d..97f10f39c3c 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -542,6 +542,8 @@ resolve_contained_functions (gfc_namespace * ns) gfc_namespace *child; gfc_entry_list *el; + resolve_entries (ns); + resolve_formal_arglists (ns); for (child = ns->contained; child; child = child->sibling) @@ -6088,10 +6090,6 @@ resolve_types (gfc_namespace * ns) gfc_current_ns = ns; - resolve_entries (ns); - - resolve_contained_functions (ns); - gfc_traverse_ns (ns, resolve_symbol); resolve_fntype (ns); @@ -6162,6 +6160,7 @@ gfc_resolve (gfc_namespace * ns) old_ns = gfc_current_ns; + resolve_contained_functions (ns); resolve_types (ns); resolve_codes (ns); -- 2.11.0