aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/symbol.c
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2020-06-28 13:52:09 +0200
committerHarald Anlauf <anlauf@gmx.de>2020-06-28 13:52:51 +0200
commitf3a8f66a83f8c94f6fbb0233cefba8032f2e4876 (patch)
treea576fc2f2b5b00223909c57d2bf01d604cb7877f /gcc/fortran/symbol.c
parent31419a80b6bf84b1bf3bcb2489b2e660563f0dfe (diff)
downloadgcc-f3a8f66a83f8c94f6fbb0233cefba8032f2e4876.zip
gcc-f3a8f66a83f8c94f6fbb0233cefba8032f2e4876.tar.gz
gcc-f3a8f66a83f8c94f6fbb0233cefba8032f2e4876.tar.bz2
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.
Diffstat (limited to 'gcc/fortran/symbol.c')
-rw-r--r--gcc/fortran/symbol.c4
1 files changed, 3 insertions, 1 deletions
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;
}