From 5d2df818b7752021425581455aca08f3fd0902b7 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Wed, 20 Mar 2019 22:32:23 +0100 Subject: [PATCH] re PR fortran/71861 ([F03] ICE in write_symbol(): bad module symbol) fix PR 71861 2019-03-20 Janus Weil PR fortran/71861 * symbol.c (check_conflict): ABSTRACT attribute conflicts with INTRINSIC attribute. 2019-03-20 Janus Weil PR fortran/71861 * gfortran.dg/interface_abstract_5.f90: New test case. From-SVN: r269827 --- gcc/fortran/ChangeLog | 6 ++++ gcc/fortran/symbol.c | 1 + gcc/testsuite/ChangeLog | 5 +++ .../gfortran.dg/interface_abstract_5.f90 | 32 +++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/interface_abstract_5.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4dd35ec6030..2a585dc45f5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-03-20 Janus Weil + + PR fortran/71861 + * symbol.c (check_conflict): ABSTRACT attribute conflicts with + INTRINSIC attribute. + 2019-03-18 Thomas Koenig PR fortran/68009 diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index c342d62ead1..ec753229a98 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -557,6 +557,7 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) conf (external, intrinsic); conf (entry, intrinsic); + conf (abstract, intrinsic); if ((attr->if_source == IFSRC_DECL && !attr->procedure) || attr->contained) conf (external, subroutine); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 00d0e9711e3..2a7a379c5dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-03-20 Janus Weil + + PR fortran/71861 + * gfortran.dg/interface_abstract_5.f90: New test case. + 2019-03-20 Jakub Jelinek PR target/89775 diff --git a/gcc/testsuite/gfortran.dg/interface_abstract_5.f90 b/gcc/testsuite/gfortran.dg/interface_abstract_5.f90 new file mode 100644 index 00000000000..fddf6b89d27 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/interface_abstract_5.f90 @@ -0,0 +1,32 @@ +! { dg-do compile } +! +! PR 71861: [7/8/9 Regression] [F03] ICE in write_symbol(): bad module symbol +! +! Contributed by Gerhard Steinmetz + +module m1 + intrinsic abs + abstract interface + function abs(x) ! { dg-error "ABSTRACT attribute conflicts with INTRINSIC attribute" } + real :: abs, x + end + end interface +end + +module m2 + abstract interface + function abs(x) + real :: abs, x + end + end interface + intrinsic abs ! { dg-error "ABSTRACT attribute conflicts with INTRINSIC attribute" } +end + +module m3 + abstract interface + function f(x) + real :: f, x + end + end interface + intrinsic f ! { dg-error "ABSTRACT attribute conflicts with INTRINSIC attribute" } +end -- 2.30.2