From 94ea69392c7feedc84b0ab3f7674c9470ed252b3 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Mon, 17 May 2010 21:58:48 +0200 Subject: [PATCH] re PR fortran/43990 ([OOP] ICE in output_constructor_regular_field, at varasm.c:4995) 2010-05-17 Janus Weil PR fortran/43990 * trans-expr.c (gfc_conv_structure): Remove unneeded and buggy code. This is now handled via 'gfc_class_null_initializer'. 2010-05-17 Janus Weil PR fortran/43990 * gfortran.dg/class_21.f03: New. From-SVN: r159511 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-expr.c | 15 +-------------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/class_21.f03 | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/class_21.f03 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 45fe11a8e17..a6d2925bf2f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-05-17 Janus Weil + + PR fortran/43990 + * trans-expr.c (gfc_conv_structure): Remove unneeded and buggy code. + This is now handled via 'gfc_class_null_initializer'. + 2010-05-17 Janus Weil * class.c (gfc_add_component_ref,gfc_class_null_initializer, diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 4d48c05b7aa..b7a296dc7a0 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -4337,20 +4337,7 @@ gfc_conv_structure (gfc_se * se, gfc_expr * expr, int init) if (!c->expr || cm->attr.allocatable) continue; - if (cm->ts.type == BT_CLASS && !cm->attr.proc_pointer) - { - gfc_component *data; - data = gfc_find_component (cm->ts.u.derived, "$data", true, true); - if (!data->backend_decl) - gfc_get_derived_type (cm->ts.u.derived); - val = gfc_conv_initializer (c->expr, &cm->ts, - TREE_TYPE (data->backend_decl), - data->attr.dimension, - data->attr.pointer); - - CONSTRUCTOR_APPEND_ELT (v, data->backend_decl, val); - } - else if (strcmp (cm->name, "$size") == 0) + if (strcmp (cm->name, "$size") == 0) { val = TYPE_SIZE_UNIT (gfc_get_derived_type (cm->ts.u.derived)); CONSTRUCTOR_APPEND_ELT (v, cm->backend_decl, val); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dfd3823e67c..683050bc8cc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-05-17 Janus Weil + + PR fortran/43990 + * gfortran.dg/class_21.f03: New. + 2010-05-17 Jason Merrill PR c++/44157 diff --git a/gcc/testsuite/gfortran.dg/class_21.f03 b/gcc/testsuite/gfortran.dg/class_21.f03 new file mode 100644 index 00000000000..93b9616aee9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_21.f03 @@ -0,0 +1,18 @@ +! { dg-do compile } +! +! PR 43990: [OOP] ICE in output_constructor_regular_field, at varasm.c:4995 +! +! Reported by Hans-Werner Boschmann + +module m + + type :: t + logical :: l = .true. + class(t),pointer :: cp => null() + end type + + type(t),save :: default_t + +end module + +! { dg-final { cleanup-modules "m" } } -- 2.30.2