diff options
| author | Mikael Morin <mikael@gcc.gnu.org> | 2015-03-25 10:15:46 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2015-03-25 10:15:46 +0000 |
| commit | 2b91aea838279a2fa5f2b09a8590e4007e87025e (patch) | |
| tree | c467d63d03b1866427667378fe81a4fc6ad7d7ea /gcc/fortran/resolve.c | |
| parent | bbf043c2d27b67d949912a3cdb2f9eb6fabcd51f (diff) | |
| download | gcc-2b91aea838279a2fa5f2b09a8590e4007e87025e.zip gcc-2b91aea838279a2fa5f2b09a8590e4007e87025e.tar.gz gcc-2b91aea838279a2fa5f2b09a8590e4007e87025e.tar.bz2 | |
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.
From-SVN: r221657
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 2a24dfd..316b413 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; } |