From: Jerry DeLisle Date: Wed, 23 May 2007 04:15:25 +0000 (+0000) Subject: re PR fortran/18923 (segfault after subroutine name confusion) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24016fdb16333fbe2a6fa54ab02828d8121cfe52;p=gcc.git re PR fortran/18923 (segfault after subroutine name confusion) 2007-05-22 Jerry DeLisle PR fortran/18923 * resolve.c (resolve_function): Don't call resolve_global_procedure if there is no name. Delete duplicated statement in ELSE clause. Co-Authored-By: Daniel Franke From-SVN: r124979 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 45f40034988..232fb914271 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-05-22 Jerry DeLisle + + PR fortran/18923 + * resolve.c (resolve_function): Don't call resolve_global_procedure if + there is no name. Delete duplicated statement in ELSE clause. + 2007-05-22 Francois-Xavier Coudert PR fortran/31627 @@ -8,7 +14,7 @@ (gfc_conv_array_ref): Likewise. (gfc_conv_ss_startstride): Likewise. -2005-05-21 Jerry DeLisle +2007-05-21 Jerry DeLisle Daniel Franke PR fortran/32002 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 746d41b3315..60da300e5bd 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -1567,7 +1567,8 @@ resolve_function (gfc_expr *expr) procedure,it must be external and should be checked for usage. */ if (sym && !sym->attr.dummy && !sym->attr.contained && sym->attr.proc != PROC_ST_FUNCTION - && !sym->attr.use_assoc) + && !sym->attr.use_assoc + && sym->name ) resolve_global_procedure (sym, &expr->where, 0); /* Switch off assumed size checking and do this again for certain kinds @@ -1750,8 +1751,6 @@ resolve_function (gfc_expr *expr) if (expr->symtree->n.sym->result && expr->symtree->n.sym->result->ts.type != BT_UNKNOWN) expr->ts = expr->symtree->n.sym->result->ts; - else - expr->ts = expr->symtree->n.sym->result->ts; } return t;