summaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2006-02-19 18:03:52 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2006-02-19 18:03:52 +0000
commit8b0e883501b45c7240394bae2cc694482291a2ea (patch)
treeb7ba154ca9a239900aa768bcc9140cb1b04d984d /gcc/fortran
parentf35b9c8d44d37489fffd197200eb39dc10ead963 (diff)
downloadgcc-8b0e883501b45c7240394bae2cc694482291a2ea.tar.gz
2006-02-19 H.J. Lu <hongjiu.lu@intel.com>
* 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
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog8
-rw-r--r--gcc/fortran/resolve.c7
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 <hongjiu.lu@intel.com>
+
+ * 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 <eedelman@gcc.gnu.org>
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);