diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2013-01-05 13:20:08 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2013-01-05 13:20:08 +0000 |
| commit | d00be3a3a3747f72ebe0dd45ade214c5e4944f0a (patch) | |
| tree | 38bcf78f6b520d21c46b008748295d557020b2a4 /gcc/fortran/trans-expr.c | |
| parent | 9e04287b861dc1cc8f19dce11b9c3147213c34b7 (diff) | |
| download | gcc-d00be3a3a3747f72ebe0dd45ade214c5e4944f0a.zip gcc-d00be3a3a3747f72ebe0dd45ade214c5e4944f0a.tar.gz gcc-d00be3a3a3747f72ebe0dd45ade214c5e4944f0a.tar.bz2 | |
re PR fortran/55827 (ICE with multiple fortran modules and character lenght determined by an interfaced pure function)
2013-01-05 Steven G. Kargl <kargl@gcc.gnu.org>
Mikael Morin <mikael@gcc.gnu.org>
PR fortran/55827
* class.c (gfc_fix_class_refs): Adapt ts initialization for the case
e->symtree == NULL.
* trans-expr.c (gfc_conv_function_expr): Init sym earlier. Use it.
2013-01-05 Steven G. Kargl <kargl@gcc.gnu.org>
Mikael Morin <mikael@gcc.gnu.org>
PR fortran/55827
* gfortran.dg/use_22.f90: New test.
Co-Authored-By: Mikael Morin <mikael@gcc.gnu.org>
From-SVN: r194928
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 0abb52d..01d3595 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -5525,20 +5525,20 @@ gfc_conv_function_expr (gfc_se * se, gfc_expr * expr) return; } + /* expr.value.function.esym is the resolved (specific) function symbol for + most functions. However this isn't set for dummy procedures. */ + sym = expr->value.function.esym; + if (!sym) + sym = expr->symtree->n.sym; + /* We distinguish statement functions from general functions to improve runtime performance. */ - if (expr->symtree->n.sym->attr.proc == PROC_ST_FUNCTION) + if (sym->attr.proc == PROC_ST_FUNCTION) { gfc_conv_statement_function (se, expr); return; } - /* expr.value.function.esym is the resolved (specific) function symbol for - most functions. However this isn't set for dummy procedures. */ - sym = expr->value.function.esym; - if (!sym) - sym = expr->symtree->n.sym; - gfc_conv_procedure_call (se, sym, expr->value.function.actual, expr, NULL); } |