diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2006-02-24 13:54:06 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2006-02-24 13:54:06 +0000 |
| commit | 0f3162e391094d4b1836f76fd97911db8bd5f274 (patch) | |
| tree | 884ccd3a739227354d054fecc42e3865c8f5fce3 /gcc | |
| parent | 8a0b57b3c7a133c91bb9375635909472749ca954 (diff) | |
| download | gcc-0f3162e391094d4b1836f76fd97911db8bd5f274.zip gcc-0f3162e391094d4b1836f76fd97911db8bd5f274.tar.gz gcc-0f3162e391094d4b1836f76fd97911db8bd5f274.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <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 * 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); |