aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Koenig <tkoenig@gcc.gnu.org>2019-12-08 13:02:54 +0000
committerThomas Koenig <tkoenig@gcc.gnu.org>2019-12-08 13:02:54 +0000
commitf477062c2ee3410545d9ff4c68bb080ae5c4f8ae (patch)
treeeed0b0a024c08224e73c7cd30e861bba48494240
parentc9942e5faee857bdb4a5cdb6b9c16ea5cc59c542 (diff)
downloadgcc-f477062c2ee3410545d9ff4c68bb080ae5c4f8ae.zip
gcc-f477062c2ee3410545d9ff4c68bb080ae5c4f8ae.tar.gz
gcc-f477062c2ee3410545d9ff4c68bb080ae5c4f8ae.tar.bz2
re PR fortran/92764 (ICE in gfc_procedure_use)
2018-12-08 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/92764 * interface.c (gfc_procedure_use): Check for existence of derived component before using (twice). 2018-12-08 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/92764 * gfortran.dg/interface_44.f90: New test. From-SVN: r279087
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/interface.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/interface_44.f906
4 files changed, 19 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 60114db..5265c2c 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-08 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ PR fortran/92764
+ * interface.c (gfc_procedure_use): Check for existence of derived
+ component before using (twice).
+
2019-12-08 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/92755
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 919c95a..2637856 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -3888,6 +3888,7 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arglist **ap, locus *where)
/* F2008, C1303 and C1304. */
if (a->expr
&& (a->expr->ts.type == BT_DERIVED || a->expr->ts.type == BT_CLASS)
+ && a->expr->ts.u.derived
&& ((a->expr->ts.u.derived->from_intmod == INTMOD_ISO_FORTRAN_ENV
&& a->expr->ts.u.derived->intmod_sym_id == ISOFORTRAN_LOCK_TYPE)
|| gfc_expr_attr (a->expr).lock_comp))
@@ -3901,6 +3902,7 @@ gfc_procedure_use (gfc_symbol *sym, gfc_actual_arglist **ap, locus *where)
if (a->expr
&& (a->expr->ts.type == BT_DERIVED || a->expr->ts.type == BT_CLASS)
+ && a->expr->ts.u.derived
&& ((a->expr->ts.u.derived->from_intmod == INTMOD_ISO_FORTRAN_ENV
&& a->expr->ts.u.derived->intmod_sym_id
== ISOFORTRAN_EVENT_TYPE)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6c28808..d2f9b47 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-08 Thomas Koenig <tkoenig@gcc.gnu.org>
+
+ PR fortran/92764
+ * gfortran.dg/interface_44.f90: New test.
+
2019-12-08 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/92755
diff --git a/gcc/testsuite/gfortran.dg/interface_44.f90 b/gcc/testsuite/gfortran.dg/interface_44.f90
new file mode 100644
index 0000000..eaafc67
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/interface_44.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! PR 92964 - this used to ICE.
+! Original test case by Arseny Solokha
+type(e6) function dn() ! { dg-error "The type for function" }
+ call sub(dn)
+end function dn