diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 71a707e80bb..76bd0af6162 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/51369
+	* init.c (build_value_init): Allow array types even when
+	processing_template_decl.
+
 2011-12-07  Ed Smith-Rowland <3dw4rd@verizon.net>
 
 	PR c++/51420
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index e1eb681de67..e93e82cac57 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -333,7 +333,8 @@ build_value_init (tree type, tsubst_flags_t complain)
      constructor.  */
 
   /* The AGGR_INIT_EXPR tweaking below breaks in templates.  */
-  gcc_assert (!processing_template_decl || SCALAR_TYPE_P (type));
+  gcc_assert (!processing_template_decl
+	      || (SCALAR_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE));
 
   if (CLASS_TYPE_P (type))
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 04d6c2304f1..1a4a182a8f7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/51369
+	* g++.dg/cpp0x/constexpr-51369.C: New test.
+
 2011-12-07  Andrew Pinski  <apinski@cavium.com>
 
 	PR middle-end/45416
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-51369.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-51369.C
new file mode 100644
index 00000000000..6606be8b6f3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-51369.C
@@ -0,0 +1,12 @@
+// PR c++/51369
+// { dg-do compile }
+// { dg-options "-std=c++11" }
+
+constexpr int x[2][2] = {};
+
+template<int>
+void
+foo ()
+{
+  x[0][0];
+}