aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-types.c
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2017-04-21 22:47:12 +0200
committerJanus Weil <janus@gcc.gnu.org>2017-04-21 22:47:12 +0200
commitfc23d35a75c0d2fe93f62434708b74e98779625d (patch)
tree27c7dd2a8af35690db4996949e9f410e31d1498d /gcc/fortran/trans-types.c
parent176e79b51e9e778a768e9e33bd4daa47600300fd (diff)
downloadgcc-fc23d35a75c0d2fe93f62434708b74e98779625d.zip
gcc-fc23d35a75c0d2fe93f62434708b74e98779625d.tar.gz
gcc-fc23d35a75c0d2fe93f62434708b74e98779625d.tar.bz2
re PR fortran/80392 ([OOP] ICE with allocatable polymorphic function result in a procedure pointer component)
2017-04-21 Janus Weil <janus@gcc.gnu.org> PR fortran/80392 * trans-types.c (gfc_get_derived_type): Prevent an infinite loop when building a derived type that includes a procedure pointer component with a polymorphic result. 2017-04-21 Janus Weil <janus@gcc.gnu.org> PR fortran/80392 * gfortran.dg/proc_ptr_comp_49.f90: New test case. From-SVN: r247069
Diffstat (limited to 'gcc/fortran/trans-types.c')
-rw-r--r--gcc/fortran/trans-types.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index fc5e486..8617cd5 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -2617,9 +2617,10 @@ gfc_get_derived_type (gfc_symbol * derived, int codimen)
the same as derived, by forcing the procedure pointer component to
be built as if the explicit interface does not exist. */
if (c->attr.proc_pointer
- && ((c->ts.type != BT_DERIVED && c->ts.type != BT_CLASS)
- || (c->ts.u.derived
- && !gfc_compare_derived_types (derived, c->ts.u.derived))))
+ && (c->ts.type != BT_DERIVED || (c->ts.u.derived
+ && !gfc_compare_derived_types (derived, c->ts.u.derived)))
+ && (c->ts.type != BT_CLASS || (CLASS_DATA (c)->ts.u.derived
+ && !gfc_compare_derived_types (derived, CLASS_DATA (c)->ts.u.derived))))
field_type = gfc_get_ppc_type (c);
else if (c->attr.proc_pointer && derived->backend_decl)
{