diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2008-11-01 14:24:03 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2008-11-01 14:24:03 +0100 |
| commit | c6acea9d4fd505ca611df1f8b248bbbecaa4fef6 (patch) | |
| tree | 3bdd5ff69b6c21e149a0a9da51fcbf7311b75671 /gcc/fortran/resolve.c | |
| parent | 002bd9f0ac7a90a1c0ed1488033505758df6c8df (diff) | |
| download | gcc-c6acea9d4fd505ca611df1f8b248bbbecaa4fef6.zip gcc-c6acea9d4fd505ca611df1f8b248bbbecaa4fef6.tar.gz gcc-c6acea9d4fd505ca611df1f8b248bbbecaa4fef6.tar.bz2 | |
re PR fortran/36322 (ICE with PROCEDURE using a complicated interface)
2008-11-01 Janus Weil <janus@gcc.gnu.org>
PR fortran/36322
PR fortran/36463
* gfortran.h: New function gfc_expr_replace_symbols.
* decl.c (match_procedure_decl): Increase reference count for interface.
* expr.c: New functions replace_symbol and gfc_expr_replace_symbols.
* resolve.c (resolve_symbol): Correctly copy array spec and char len
of PROCEDURE declarations from their interface.
* symbol.c (gfc_get_default_type): Enhanced error message.
(copy_formal_args): Call copy_formal_args recursively for arguments.
* trans-expr.c (gfc_conv_function_call): Bugfix.
2008-11-01 Janus Weil <janus@gcc.gnu.org>
PR fortran/36322
PR fortran/36463
* gfortran.dg/proc_decl_17.f90: New.
* gfortran.dg/proc_decl_18.f90: New.
From-SVN: r141515
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 3cd6899..bccb46a 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -8917,8 +8917,26 @@ resolve_symbol (gfc_symbol *sym) sym->attr.dimension = ifc->attr.dimension; sym->attr.recursive = ifc->attr.recursive; sym->attr.always_explicit = ifc->attr.always_explicit; - sym->as = gfc_copy_array_spec (ifc->as); copy_formal_args (sym, ifc); + /* Copy array spec. */ + sym->as = gfc_copy_array_spec (ifc->as); + if (sym->as) + { + int i; + for (i = 0; i < sym->as->rank; i++) + { + gfc_expr_replace_symbols (sym->as->lower[i], sym); + gfc_expr_replace_symbols (sym->as->upper[i], sym); + } + } + /* Copy char length. */ + if (ifc->ts.cl) + { + sym->ts.cl = gfc_get_charlen(); + sym->ts.cl->resolved = ifc->ts.cl->resolved; + sym->ts.cl->length = gfc_copy_expr (ifc->ts.cl->length); + gfc_expr_replace_symbols (sym->ts.cl->length, sym); + } } else if (sym->ts.interface->name[0] != '\0') { |