From 0f3162e391094d4b1836f76fd97911db8bd5f274 Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Fri, 24 Feb 2006 13:54:06 +0000 Subject: [PATCH] re PR fortran/26409 (ICE on Assumed shape nested subroutine) 2006-02-24 Paul Thomas PR fortran/26409 * resolve.c (resolve_contained_functions, resolve_types, gfc_resolve): Revert patch of 2006-02-19. From-SVN: r111417 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f000725..c5e6bfa 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2006-02-24 Paul Thomas + PR fortran/26409 + * resolve.c (resolve_contained_functions, resolve_types, + gfc_resolve): Revert patch of 2006-02-19. + +2006-02-24 Paul Thomas + PR fortran/24519 * dependency.c (gfc_is_same_range): Correct typo. (gfc_check_section_vs_section): Call gfc_is_same_range. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 97f10f3..63b2cd9 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -542,8 +542,6 @@ 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) @@ -6090,6 +6088,10 @@ 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); @@ -6160,7 +6162,6 @@ gfc_resolve (gfc_namespace * ns) old_ns = gfc_current_ns; - resolve_contained_functions (ns); resolve_types (ns); resolve_codes (ns); -- 2.7.4