From: Daniel Franke <dfranke@gcc.gnu.org>
Date: Thu, 24 Jan 2008 21:28:20 +0000 (-0500)
Subject: re PR fortran/34202 (ICE (segfault) for invalid code in formalize_init_expr (data... 
X-Git-Tag: releases/gcc-4.3.0~419
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c8d27031551bc95dd08a0a22d78da2f15c9b528;p=thirdparty%2Fgcc.git

re PR fortran/34202 (ICE (segfault) for invalid code in formalize_init_expr (data.c:691))

gcc/fortran:
2008-01-24  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/34202
	* data.c (formalize_structure_cons): Skip formalization on
	empty structures.

gcc/testsuite:
2008-01-24  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/34202
        * gfortran.dg/empty_type.f90: New test.

From-SVN: r131810
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2998e73f8947..c9cdfde362e3 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-24  Daniel Franke  <franke.daniel@gmail.com>
+
+	PR fortran/34202
+	* data.c (formalize_structure_cons): Skip formalization on
+	empty structures.
+
 2008-01-24  Daniel Franke  <franke.daniel@gmail.com>
 
 	* gfortran.texi (OpenMP): Extended existing documentation.
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c
index 59ac5e9d8e6f..41dc85f8fa06 100644
--- a/gcc/fortran/data.c
+++ b/gcc/fortran/data.c
@@ -688,7 +688,7 @@ formalize_structure_cons (gfc_expr *expr)
   c = expr->value.constructor;
 
   /* Constructor is already formalized.  */
-  if (c->n.component == NULL)
+  if (!c || c->n.component == NULL)
     return;
 
   head = tail = NULL;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 70f1e0d5c1d9..8af0ba245b44 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,7 +1,12 @@
+2008-01-24  Daniel Franke  <franke.daniel@gmail.com>
+
+	PR fortran/34202
+	* gfortran.dg/empty_type.f90: New test.
+
 2008-01-24  Paolo Carlini  <pcarlini@suse.de>
 
-        PR c++/34603
-        * g++.dg/template/crash77.C: New.
+	PR c++/34603
+	* g++.dg/template/crash77.C: New.
 
 2008-01-24  Uros Bizjak  <ubizjak@gmail.com>
 
diff --git a/gcc/testsuite/gfortran.dg/empty_type.f90 b/gcc/testsuite/gfortran.dg/empty_type.f90
new file mode 100644
index 000000000000..cea25660dce0
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/empty_type.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+! PR fortran/34202
+! ICE on contruction of empty types
+! Testcase contributed by Tobias Burnus
+
+program bug4a
+  implicit none
+  type bug4
+    ! Intentionally left empty
+  end type bug4
+
+  type compound
+    type(bug4) b
+  end type compound
+
+  type(bug4), parameter :: f = bug4()
+  type(compound), parameter :: g = compound(bug4())
+end program bug4a
+