From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 24 Sep 2007 09:17:10 +0000 (+0200)
Subject: re PR debug/33316 (ICE on valid variable-length automatic array in const struct)
X-Git-Tag: releases/gcc-4.2.2~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=785d062ea3068714f2a3f9eb04baa1cbdfc7bc6c;p=thirdparty%2Fgcc.git

re PR debug/33316 (ICE on valid variable-length automatic array in const struct)

	PR debug/33316
	* dwarf2out.c (modified_type_die): Handle TYPE_DECL with NULL
	DECL_NAME.
	* dbxout.c (dbxout_type): Likewise.

	* gcc.dg/debug/pr33316.c: New test.

From-SVN: r128709
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80b357dda382..42d02125d917 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/33316
+	* dwarf2out.c (modified_type_die): Handle TYPE_DECL with NULL
+	DECL_NAME.
+	* dbxout.c (dbxout_type): Likewise.
+
 2007-09-23  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure.ac (ld_vers): Support GNU linker version xx.xx.*
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index e7553edb4dee..963f5a3ce49f 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -2023,7 +2023,11 @@ dbxout_type (tree type, int full)
 	       another type's definition; instead, output an xref
 	       and let the definition come when the name is defined.  */
 	    stabstr_S ((TREE_CODE (type) == RECORD_TYPE) ? "xs" : "xu");
-	    if (TYPE_NAME (type) != 0)
+	    if (TYPE_NAME (type) != 0
+		/* The C frontend creates for anonymous variable length
+		   records/unions TYPE_NAME with DECL_NAME NULL.  */
+		&& (TREE_CODE (TYPE_NAME (type)) != TYPE_DECL
+		    || DECL_NAME (TYPE_NAME (type))))
 	      dbxout_type_name (type);
 	    else
 	      {
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 6c764166de46..2d8932ae358f 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -8518,7 +8518,8 @@ modified_type_die (tree type, int is_const_type, int is_volatile_type,
      don't output a DW_TAG_typedef, since there isn't one in the
      user's program; just attach a DW_AT_name to the type.  */
   if (name
-      && (TREE_CODE (name) != TYPE_DECL || TREE_TYPE (name) == qualified_type))
+      && (TREE_CODE (name) != TYPE_DECL
+	  || (TREE_TYPE (name) == qualified_type && DECL_NAME (name))))
     {
       if (TREE_CODE (name) == TYPE_DECL)
 	/* Could just call add_name_and_src_coords_attributes here,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b9b825795fa3..7bfa71fc79c2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/33316
+	* gcc.dg/debug/pr33316.c: New test.
+
 2007-09-20  Paolo Carlini  <pcarlini@suse.de>
 
 	PR c++/33459
diff --git a/gcc/testsuite/gcc.dg/debug/pr33316.c b/gcc/testsuite/gcc.dg/debug/pr33316.c
new file mode 100644
index 000000000000..d43478bb54f5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/pr33316.c
@@ -0,0 +1,15 @@
+/* PR debug/33316 */
+
+int
+foo (void *x, int y)
+{
+  const struct { int d[y]; } *a = x;
+  return a[0].d[0];
+}
+
+int
+bar (void *x, int y)
+{
+  const struct S { int d[y]; } *a = x;
+  return a[0].d[0];
+}