From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Fri, 17 Jan 2014 15:40:13 +0000 (+0000)
Subject: re PR c++/59269 (ICE with reference in union)
X-Git-Tag: releases/gcc-4.9.0~1604
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12185846cf9a347fdbd3b3e192100d9be1718bde;p=thirdparty%2Fgcc.git

re PR c++/59269 (ICE with reference in union)

/cp
2014-01-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/59269
	* init.c (build_value_init_noctor): Assert !TYPE_HAS_COMPLEX_DFLT
	only when errorcount == 0.

/testsuite
2014-01-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/59269
	* g++.dg/cpp0x/nsdmi-union4.C: New.

From-SVN: r206718
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 66896d9aa135..45a6c9778e82 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/59269
+	* init.c (build_value_init_noctor): Assert !TYPE_HAS_COMPLEX_DFLT
+	only when errorcount == 0.
+
 2014-01-17  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/59838
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 67761dcf4d7c..931b5c8c1d25 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -382,7 +382,8 @@ build_value_init_noctor (tree type, tsubst_flags_t complain)
      SFINAE-enabled.  */
   if (CLASS_TYPE_P (type))
     {
-      gcc_assert (!TYPE_HAS_COMPLEX_DFLT (type));
+      gcc_assert (!TYPE_HAS_COMPLEX_DFLT (type)
+		  || errorcount != 0);
 	
       if (TREE_CODE (type) != UNION_TYPE)
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6d57b4126885..98bc52802930 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/59269
+	* g++.dg/cpp0x/nsdmi-union4.C: New.
+
 2014-01-17  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/59838
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C
new file mode 100644
index 000000000000..c21fdcaed5b8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-union4.C
@@ -0,0 +1,12 @@
+// PR c++/59269
+// { dg-require-effective-target c++11 }
+
+union U
+{
+  int& i = 0;  // { dg-error "reference" }
+};
+
+void foo()
+{
+  U();
+}