aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/resolve.c
diff options
context:
space:
mode:
authormikael <mikael@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-25 10:15:46 +0000
committermikael <mikael@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-25 10:15:46 +0000
commitb07e936a5b882fdf2f431bebf8dcf0b6719caa49 (patch)
treec467d63d03b1866427667378fe81a4fc6ad7d7ea /gcc/fortran/resolve.c
parent35fafcb2801326dc596c066329b1e7624b051c53 (diff)
Fix regression introduced at revision 221586.
PR fortran/64952 PR fortran/65532 fortran/ * gfortran.h (struct gfc_namespace): New field 'types_resolved'. * resolve.c (resolve_types): Return early if field 'types_resolved' is set. Set 'types_resolved' at the end. testsuite/ * gfortran.dg/data_initialized_3.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221657 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/resolve.c')
-rw-r--r--gcc/fortran/resolve.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 2a24dfd8eda..316b413d756 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -14942,6 +14942,9 @@ resolve_types (gfc_namespace *ns)
gfc_equiv *eq;
gfc_namespace* old_ns = gfc_current_ns;
+ if (ns->types_resolved)
+ return;
+
/* Check that all IMPLICIT types are ok. */
if (!ns->seen_implicit_none)
{
@@ -15016,6 +15019,8 @@ resolve_types (gfc_namespace *ns)
gfc_resolve_omp_udrs (ns->omp_udr_root);
+ ns->types_resolved = 1;
+
gfc_current_ns = old_ns;
}