diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f979af5999fb..defc0a5eb44b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/51430
+	* pt.c (tsubst_decl): Don't call strip_array_domain on
+	error_mark_node.
+
 2011-12-06  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/51431
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 15ef7a0caead..7603c1151e55 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -10622,7 +10622,9 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
 	      type = DECL_ORIGINAL_TYPE (t);
 	    else
 	      type = TREE_TYPE (t);
-	    if (TREE_CODE (t) == VAR_DECL && VAR_HAD_UNKNOWN_BOUND (t))
+	    if (TREE_CODE (t) == VAR_DECL
+		&& VAR_HAD_UNKNOWN_BOUND (t)
+		&& type != error_mark_node)
 	      type = strip_array_domain (type);
 	    type = tsubst (type, args, complain, in_decl);
 	  }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2353dd9ea7a2..507f9dff47cf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/51430
+	* g++.dg/template/static32.C: New test.
+
 2011-12-06  Uros Bizjak  <ubizjak@gmail.com>
 
 	* g++.dg/opt/pr51396.C: Use dg-additional-options.
diff --git a/gcc/testsuite/g++.dg/template/static32.C b/gcc/testsuite/g++.dg/template/static32.C
new file mode 100644
index 000000000000..b17d14dd0be9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/static32.C
@@ -0,0 +1,9 @@
+// PR c++/51430
+// { dg-do compile }
+
+template<int> struct A
+{
+  static const int x[] = 0;	// { dg-error "in-class initialization|initializer fails" }
+};
+
+A<0> a;