diff options
author | Janus Weil <janus@gcc.gnu.org> | 2019-03-20 22:32:23 +0100 |
---|---|---|
committer | Janus Weil <janus@gcc.gnu.org> | 2019-03-20 22:32:23 +0100 |
commit | 5d2df818b7752021425581455aca08f3fd0902b7 (patch) | |
tree | b07449d9aadb06c06b6bea20c1d6e54725024d08 /gcc | |
parent | 292a8bbb27fd13e87552ca7c98a9d4e82c21b385 (diff) | |
download | gcc-5d2df818b7752021425581455aca08f3fd0902b7.zip gcc-5d2df818b7752021425581455aca08f3fd0902b7.tar.gz gcc-5d2df818b7752021425581455aca08f3fd0902b7.tar.bz2 |
re PR fortran/71861 ([F03] ICE in write_symbol(): bad module symbol)
fix PR 71861
2019-03-20 Janus Weil <janus@gcc.gnu.org>
PR fortran/71861
* symbol.c (check_conflict): ABSTRACT attribute conflicts with
INTRINSIC attribute.
2019-03-20 Janus Weil <janus@gcc.gnu.org>
PR fortran/71861
* gfortran.dg/interface_abstract_5.f90: New test case.
From-SVN: r269827
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/fortran/symbol.c | 1 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/interface_abstract_5.f90 | 32 |
4 files changed, 44 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4dd35ec..2a585dc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-03-20 Janus Weil <janus@gcc.gnu.org> + + PR fortran/71861 + * symbol.c (check_conflict): ABSTRACT attribute conflicts with + INTRINSIC attribute. + 2019-03-18 Thomas Koenig <tkoeng@gcc.gnu.org> PR fortran/68009 diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index c342d62..ec75322 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 00d0e97..2a7a379 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-03-20 Janus Weil <janus@gcc.gnu.org> + + PR fortran/71861 + * gfortran.dg/interface_abstract_5.f90: New test case. + 2019-03-20 Jakub Jelinek <jakub@redhat.com> 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 0000000..fddf6b8 --- /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 <gerhard.steinmetz.fortran@t-online.de> + +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 |