From c6569cd04e1677007aad30c13ed934c34f9ecaac Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Tue, 23 Feb 2010 13:32:20 -0500
Subject: [PATCH] re PR c++/43143 ([c++0x] array value-initialization and
 variadics)

	PR c++/43143
	* typeck2.c (digest_init_r): Accept value init of array.

From-SVN: r157015
---
 gcc/cp/ChangeLog                         |  6 +++++-
 gcc/cp/typeck2.c                         |  8 +++++---
 gcc/testsuite/ChangeLog                  |  5 +++++
 gcc/testsuite/g++.dg/cpp0x/variadic100.C | 15 +++++++++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic100.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a4a5cc2498d..c72e7e3dc6b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,8 +1,12 @@
+2010-02-23  Jason Merrill  <jason@redhat.com>
+
+	PR c++/43143
+	* typeck2.c (digest_init_r): Accept value init of array.
+
 2010-02-22  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
 	PR c++/43126
 	* typeck.c (convert_arguments): Update error message.
-	
 
 2010-02-22  Mike Stump  <mikestump@comcast.net>
 
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 66ff3c16264..7ec4374a709 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -929,10 +929,12 @@ digest_init_r (tree type, tree init, bool nested, int flags)
 	}
 
       if (TREE_CODE (type) == ARRAY_TYPE
-	  && TREE_CODE (init) != CONSTRUCTOR)
+	  && !BRACE_ENCLOSED_INITIALIZER_P (init))
 	{
-	  /* Allow the result of build_array_copy.  */
-	  if (TREE_CODE (init) == TARGET_EXPR
+	  /* Allow the result of build_array_copy and of
+	     build_value_init_noctor.  */
+	  if ((TREE_CODE (init) == TARGET_EXPR
+	       || TREE_CODE (init) == CONSTRUCTOR)
 	      && (same_type_ignoring_top_level_qualifiers_p
 		  (type, TREE_TYPE (init))))
 	    return init;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7fe352009aa..5f9fdc03f38 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-23  Jason Merrill  <jason@redhat.com>
+
+	PR c++/43143
+	* g++.dg/cpp0x/variadic100.C: New.
+
 2010-02-23  Jason Merrill  <jason@redhat.com>
 
 	PR debug/42800
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic100.C b/gcc/testsuite/g++.dg/cpp0x/variadic100.C
new file mode 100644
index 00000000000..a364bbc9116
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic100.C
@@ -0,0 +1,15 @@
+// PR c++/43143
+// { dg-options "-std=c++0x" }
+
+template<typename T>
+T&& declval();
+
+template<class T, class... Args>
+void test() {
+  T t(declval<Args>()...);
+}
+
+int main() {
+  test<const int>(); // OK
+  test<int[23]>(); // Error
+}
-- 
2.30.2