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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4dd35ec6030cec691563628dd4d6f6e5406ee472..2a585dc45f5e6bd0d1c6fe33eeeda7c680803c40 100644 (file)
--- 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 c342d62ead1b0ef59762c1b8cf8d1f51867078f1..ec753229a986b6be965b419ac6b1bd62be22e71f 100644 (file)
--- 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 00d0e9711e3f365ae0ae27843de886ff62616b6c..2a7a379c5dc384fec62143ec49276610530a3047 100644 (file)
--- 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 (file)
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