re PR fortran/26409 (ICE on Assumed shape nested subroutine)

2006-02-24  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/26409
	* resolve.c (resolve_contained_functions, resolve_types,
	gfc_resolve): Revert patch of 2006-02-19.

From-SVN: r111417

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f00072509bba7d32974e66e0771ffc23a91c2554..c5e6bfa6564542215d78f931d6a2e293b2861f2f 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-24  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/26409
+       * resolve.c (resolve_contained_functions, resolve_types,
+       gfc_resolve): Revert patch of 2006-02-19.
+
 2006-02-24  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/24519

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 97f10f39c3c62771328fd33e133667b95aae7e78..63b2cd9904d0027cce1239079d13a128eedc26bf 100644 (file)
--- 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);