aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/resolve.c8
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/proc_ptr_comp_42.f9016
4 files changed, 32 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b525ff4..6f2e549 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
2015-01-11 Janus Weil <janus@gcc.gnu.org>
+ PR fortran/58023
+ * resolve.c (resolve_fl_derived0): Set error flag if problems with the
+ interface of a procedure-pointer component were detected.
+
+2015-01-11 Janus Weil <janus@gcc.gnu.org>
+
PR fortran/64508
* interface.c (compare_parameter): Interface check for
procedure-pointer component as actual argument.
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index a0e32b1..6b24443 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12424,9 +12424,11 @@ resolve_fl_derived0 (gfc_symbol *sym)
{
gfc_symbol *ifc = c->ts.interface;
- if (!sym->attr.vtype
- && !check_proc_interface (ifc, &c->loc))
- return false;
+ if (!sym->attr.vtype && !check_proc_interface (ifc, &c->loc))
+ {
+ c->tb->error = 1;
+ return false;
+ }
if (ifc->attr.if_source || ifc->attr.intrinsic)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a7c24ce..4f729fd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2015-01-11 Janus Weil <janus@gcc.gnu.org>
+ PR fortran/58023
+ * gfortran.dg/proc_ptr_comp_42.f90: New.
+
+2015-01-11 Janus Weil <janus@gcc.gnu.org>
+
PR fortran/64508
* gfortran.dg/proc_ptr_comp_41.f90: New.
diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_comp_42.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_comp_42.f90
new file mode 100644
index 0000000..3773fae3
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_comp_42.f90
@@ -0,0 +1,16 @@
+! { dg-do compile }
+!
+! PR 58023: [F03] ICE on invalid with bad PPC declaration
+!
+! Contributed by Andrew Benson <abensonca@gmail.com>
+
+ implicit none
+
+ type :: sfd
+ procedure(mr), pointer :: mr2 ! { dg-error "must be explicit" }
+ end type
+
+ type(sfd):: d
+ print *, d%mr2()
+
+end