From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 18 Apr 2011 23:29:30 +0000 (+0000)
Subject: 	PR c++/48537
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=065054b0b29c40548abd13c272431507d035b30a;p=pf3gnuchains%2Fgcc-fork.git

	PR c++/48537
	* init.c (build_value_init): Handle UNION_TYPE the same.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@172679 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c263c78e225..5b9eb2e2657 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-18  Jason Merrill  <jason@redhat.com>
+
+	PR c++/48537
+	* init.c (build_value_init): Handle UNION_TYPE the same.
+
 2011-04-18  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/48632
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index e1961c8ee77..4798257c57d 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -343,7 +343,7 @@ build_value_init (tree type, tsubst_flags_t complain)
 	   build_special_member_call (NULL_TREE, complete_ctor_identifier,
 				      NULL, type, LOOKUP_NORMAL,
 				      complain));
-      else if (TREE_CODE (type) != UNION_TYPE && TYPE_NEEDS_CONSTRUCTING (type))
+      else if (TYPE_NEEDS_CONSTRUCTING (type))
 	{
 	  /* This is a class that needs constructing, but doesn't have
 	     a user-provided constructor.  So we need to zero-initialize
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8f71d86ffef..e13ac42ab42 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-18  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp0x/union4.C: New.
+
 2011-04-18  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/48661
diff --git a/gcc/testsuite/g++.dg/cpp0x/union4.C b/gcc/testsuite/g++.dg/cpp0x/union4.C
new file mode 100644
index 00000000000..07050475d36
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/union4.C
@@ -0,0 +1,17 @@
+// PR c++/48537
+// { dg-options -std=c++0x }
+
+struct SFoo
+{
+  SFoo() =delete;		// { dg-error "declared" }
+};
+
+union UFoo			// { dg-error "deleted" }
+{
+  SFoo foo;
+};
+
+int main()
+{
+  UFoo();			// { dg-error "deleted" }
+}