From 1072bff8143c56ae3de8d08d122f4960f9bdcdd2 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Thu, 24 May 2018 22:31:11 +0000 Subject: [PATCH] re PR fortran/85779 (ICE in gfc_typename, at fortran/misc.c:156) 2018-05-24 Steven G. Kargl PR fortran/85779 * decl.c (gfc_match_derived_decl): Fix NULL point dereference. 2018-05-24 Steven G. Kargl PR fortran/85779 * gfortran.dg/pr85779_1.f90: New test. * gfortran.dg/pr85779_2.f90: Ditto. * gfortran.dg/pr85779_3.f90: Ditto. From-SVN: r260697 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/decl.c | 8 ++++++-- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gfortran.dg/pr85779_1.f90 | 6 ++++++ gcc/testsuite/gfortran.dg/pr85779_2.f90 | 7 +++++++ gcc/testsuite/gfortran.dg/pr85779_3.f90 | 7 +++++++ 6 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr85779_1.f90 create mode 100644 gcc/testsuite/gfortran.dg/pr85779_2.f90 create mode 100644 gcc/testsuite/gfortran.dg/pr85779_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a65470c4447..534b27722c0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-05-24 Steven G. Kargl + + PR fortran/85779 + * decl.c (gfc_match_derived_decl): Fix NULL point dereference. + 2018-05-24 Steven G. Kargl PR fortran/85895 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 2f903300bab..bd343b2b163 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -9960,8 +9960,12 @@ gfc_match_derived_decl (void) if (!gensym->attr.generic && gensym->ts.type != BT_UNKNOWN) { - gfc_error ("Derived type name %qs at %C already has a basic type " - "of %s", gensym->name, gfc_typename (&gensym->ts)); + if (gensym->ts.u.derived) + gfc_error ("Derived type name %qs at %C already has a basic type " + "of %s", gensym->name, gfc_typename (&gensym->ts)); + else + gfc_error ("Derived type name %qs at %C already has a basic type", + gensym->name); return MATCH_ERROR; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 707db425ec5..8273fca099e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2018-05-24 Steven G. Kargl + + PR fortran/85779 + * gfortran.dg/pr85779_1.f90: New test. + * gfortran.dg/pr85779_2.f90: Ditto. + * gfortran.dg/pr85779_3.f90: Ditto. + 2018-05-24 Steven G. Kargl PR fortran/85895 diff --git a/gcc/testsuite/gfortran.dg/pr85779_1.f90 b/gcc/testsuite/gfortran.dg/pr85779_1.f90 new file mode 100644 index 00000000000..186568ff124 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr85779_1.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +! PR fortran/85779 +type(t) function f() ! { dg-error "is not accessible" } + type f ! { dg-error "already has a basic type" } + end type ! { dg-error "END FUNCTION statement" } +end diff --git a/gcc/testsuite/gfortran.dg/pr85779_2.f90 b/gcc/testsuite/gfortran.dg/pr85779_2.f90 new file mode 100644 index 00000000000..4cc3c62979c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr85779_2.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR fortran/85779 +type(t) function f() result(z) ! { dg-error "is not accessible" } + type z ! { dg-error "already has a basic type" } + end type ! { dg-error "END FUNCTION statement" } +end + diff --git a/gcc/testsuite/gfortran.dg/pr85779_3.f90 b/gcc/testsuite/gfortran.dg/pr85779_3.f90 new file mode 100644 index 00000000000..fba1133b3ea --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr85779_3.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR fortran/85779 +class(t) function f() ! { dg-error "must be dummy, allocatable or pointer" } + type f ! { dg-error "already has a basic type" } + end type ! { dg-error "END FUNCTION statement" } +end + -- 2.30.2