From: Jason Merrill <jason@redhat.com>
Date: Tue, 7 Jan 2014 21:24:37 +0000 (-0500)
Subject: re PR c++/58965 ([c++11] ICE with member initializer in static union)
X-Git-Tag: releases/gcc-4.9.0~1795
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a5e7deb5f93f04e027fd5baa1876370d6d6697f;p=thirdparty%2Fgcc.git

re PR c++/58965 ([c++11] ICE with member initializer in static union)

	PR c++/58965
	* mangle.c (write_guarded_var_name): Handle null DECL_NAME.

From-SVN: r206405
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b31014fcc752..cdb376d9c6d4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-07  Jason Merrill  <jason@redhat.com>
+
+	PR c++/58965
+	* mangle.c (write_guarded_var_name): Handle null DECL_NAME.
+
 2014-01-07  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* semantics.c (trait_expr_value, [CPTK_IS_BASE_OF]): Implement
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 6f32a43f3236..dc7d4eab9013 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -3775,7 +3775,8 @@ mangle_conv_op_name_for_type (const tree type)
 static void
 write_guarded_var_name (const tree variable)
 {
-  if (strncmp (IDENTIFIER_POINTER (DECL_NAME (variable)), "_ZGR", 4) == 0)
+  if (DECL_NAME (variable)
+      && strncmp (IDENTIFIER_POINTER (DECL_NAME (variable)), "_ZGR", 4) == 0)
     /* The name of a guard variable for a reference temporary should refer
        to the reference, not the temporary.  */
     write_string (IDENTIFIER_POINTER (DECL_NAME (variable)) + 4);
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-union3.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-union3.C
new file mode 100644
index 000000000000..35f6509df786
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-union3.C
@@ -0,0 +1,10 @@
+// PR c++/58965
+// { dg-require-effective-target c++11 }
+
+void foo()
+{
+  static union
+  {
+    int i = i;
+  };
+}