From f3a8f66a83f8c94f6fbb0233cefba8032f2e4876 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Sun, 28 Jun 2020 13:52:09 +0200 Subject: PR fortran/95880 - ICE in gfc_add_type, at fortran/symbol.c:2030 The fix for PR39695 did not properly distinguish between procedure names and other symbols names in errors emitted for invalid code. Fix that. gcc/fortran/ PR fortran/95880 * symbol.c (gfc_add_type): If sym->ns->proc_name is set, use it, otherwise fall back to sym->name. --- gcc/fortran/symbol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index ba388ff..96e4cee 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -2027,7 +2027,9 @@ gfc_add_type (gfc_symbol *sym, gfc_typespec *ts, locus *where) || (flavor == FL_PROCEDURE && sym->attr.subroutine) || flavor == FL_DERIVED || flavor == FL_NAMELIST) { - gfc_error ("Symbol %qs at %L cannot have a type", sym->ns->proc_name->name, where); + gfc_error ("Symbol %qs at %L cannot have a type", + sym->ns->proc_name ? sym->ns->proc_name->name : sym->name, + where); return false; } -- cgit v1.1