From 879b0a1db9b13b1cb3632c974178d05c70ed8d57 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 1 Apr 2013 17:18:23 -0400
Subject: [PATCH] re PR c++/56772 (placement new operator does not work inside
 function template for array types.)

	PR c++/56772
	* init.c (build_new): Don't try to process an array initializer
	at template definition time.

From-SVN: r197326
---
 gcc/cp/ChangeLog                        |  4 ++++
 gcc/cp/init.c                           |  1 +
 gcc/testsuite/g++.dg/cpp0x/initlist68.C | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist68.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7e58f704747..6374fff4348 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2013-04-01  Jason Merrill  <jason@redhat.com>
 
+	PR c++/56772
+	* init.c (build_new): Don't try to process an array initializer
+	at template definition time.
+
 	PR c++/56793
 	* typeck.c (finish_class_member_access_expr): Handle enum scope.
 
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index ab6af1411a6..7b7de022ee6 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -2920,6 +2920,7 @@ build_new (vec<tree, va_gc> **placement, tree type, tree nelts,
       if (dependent_type_p (type)
 	  || any_type_dependent_arguments_p (*placement)
 	  || (nelts && type_dependent_expression_p (nelts))
+	  || (nelts && *init)
 	  || any_type_dependent_arguments_p (*init))
 	return build_raw_new_expr (*placement, type, nelts, *init,
 				   use_global_new);
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist68.C b/gcc/testsuite/g++.dg/cpp0x/initlist68.C
new file mode 100644
index 00000000000..7cfe1a34bee
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist68.C
@@ -0,0 +1,20 @@
+// PR c++/56772
+// { dg-require-effective-target c++11 }
+
+typedef __SIZE_TYPE__ size_t;
+void* operator new[](size_t, void *p) { return p; }
+template <typename T = size_t>
+void f ()
+{
+  size_t coord [2][2];
+  new (&coord) size_t [2][2]
+   {
+     {0,0},
+     {0,0},
+   };
+}
+
+int main ()
+{
+   f<>();
+}
-- 
2.30.2