aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2009-07-15 10:41:29 +0200
committerJanus Weil <janus@gcc.gnu.org>2009-07-15 10:41:29 +0200
commitf6ddbf11c30d0e42e369e7b7f315a66e2e601207 (patch)
treebaaa16eca5288fc980d0a864fb21a98609bd0762 /gcc/fortran
parent76a15894e9b62113a29a6bd5dfa397dfc9cceb72 (diff)
downloadgcc-f6ddbf11c30d0e42e369e7b7f315a66e2e601207.zip
gcc-f6ddbf11c30d0e42e369e7b7f315a66e2e601207.tar.gz
gcc-f6ddbf11c30d0e42e369e7b7f315a66e2e601207.tar.bz2
re PR fortran/40743 (ICE when compiling iso_varying_string.f95 at revision 149591)
2009-07-15 Janus Weil <janus@gcc.gnu.org> PR fortran/40743 * resolve.c (resolve_symbol): Don't resolve the formal namespace of a contained procedure. 2009-07-15 Janus Weil <janus@gcc.gnu.org> PR fortran/40743 * gfortran.dg/interface_assignment_4.f90: New. From-SVN: r149662
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/resolve.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index aaf2c88..d83acc7 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-15 Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/40743
+ * resolve.c (resolve_symbol): Don't resolve the formal namespace of a
+ contained procedure.
+
2009-07-14 Taras Glek <tglek@mozilla.com>
Rafael Espindola <espindola@google.com>
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 880dfd0..5b4fc2d 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -9842,7 +9842,8 @@ resolve_symbol (gfc_symbol *sym)
formal_arg_flag = 0;
/* Resolve formal namespaces. */
- if (sym->formal_ns && sym->formal_ns != gfc_current_ns)
+ if (sym->formal_ns && sym->formal_ns != gfc_current_ns
+ && !sym->attr.contained)
gfc_resolve (sym->formal_ns);
/* Make sure the formal namespace is present. */