From: janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 17 May 2010 19:58:48 +0000 (+0000)
Subject: 2010-05-17  Janus Weil  <janus@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c75339c4af0b37a67933ede0dccae3ca45623f8;p=thirdparty%2Fgcc.git

2010-05-17  Janus Weil  <janus@gcc.gnu.org>

	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  <janus@gcc.gnu.org>

	PR fortran/43990
	* gfortran.dg/class_21.f03: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159511 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 45fe11a8e17f..a6d2925bf2f6 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-17  Janus Weil  <janus@gcc.gnu.org>
+
+	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  <janus@gcc.gnu.org>
 
 	* 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 4d48c05b7aa5..b7a296dc7a0d 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 dfd3823e67c7..683050bc8cc8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-17  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/43990
+	* gfortran.dg/class_21.f03: New.
+
 2010-05-17  Jason Merrill  <jason@redhat.com>
 
 	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 000000000000..93b9616aee9a
--- /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 <boschmann@tp1.physik.uni-siegen.de>
+
+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" } }