From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 3 Feb 2009 17:23:11 +0000 (+0000)
Subject: 	PR c++/39056
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbd553d07fb62922fac249f2cf8ed33334c27c1b;p=thirdparty%2Fgcc.git

	PR c++/39056
	* typeck2.c (digest_init_r): Don't call process_init_constructor
	for COMPLEX_TYPE.

	* g++.dg/cpp0x/initlist13.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143899 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 39a5eb855a22..c84de888aed4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/39056
+	* typeck2.c (digest_init_r): Don't call process_init_constructor
+	for COMPLEX_TYPE.
+
 2009-02-03  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR c++/36897
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index a19a99920b63..526f780cddf1 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -789,7 +789,8 @@ digest_init_r (tree type, tree init, bool nested)
     }
 
   /* Handle scalar types (including conversions) and references.  */
-  if (TREE_CODE (type) != COMPLEX_TYPE
+  if ((TREE_CODE (type) != COMPLEX_TYPE
+       || BRACE_ENCLOSED_INITIALIZER_P (init))
       && (SCALAR_TYPE_P (type) || code == REFERENCE_TYPE))
     {
       tree *exp;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ba77486a3e78..128a7620803e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/39056
+	* g++.dg/cpp0x/initlist13.C: New test.
+
 2009-02-03  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR c++/36897
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist13.C b/gcc/testsuite/g++.dg/cpp0x/initlist13.C
new file mode 100644
index 000000000000..98af92bca539
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist13.C
@@ -0,0 +1,5 @@
+// PR c++/39056
+// { dg-do compile }
+// { dg-options "-std=gnu++0x" }
+
+__complex__ int i ({0});	// { dg-error "cannot convert" }