diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4a2baa00ad5c907d92ab0f3854c459b7a09d3943..eaa43e1e1b7c07c9fc000ec37e9559fc7f394b42 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/56403
+	* init.c (build_zero_init_1): Use RECORD_OR_UNION_CODE_P instead
+	of CLASS_TYPE_P.
+
 2013-02-22  Jason Merrill  <jason@redhat.com>
 
 	PR c++/40405
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 6f46404760ebb40c6c82c9f94530313749cb7142..697f11ff52eff44ebcdf554cb4c8ba4f315ebdac 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -179,7 +179,7 @@ build_zero_init_1 (tree type, tree nelts, bool static_storage_p,
     init = convert (type, nullptr_node);
   else if (SCALAR_TYPE_P (type))
     init = convert (type, integer_zero_node);
-  else if (CLASS_TYPE_P (type))
+  else if (RECORD_OR_UNION_CODE_P (TREE_CODE (type)))
     {
       tree field;
       vec<constructor_elt, va_gc> *v = NULL;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4be79bec69b327b1793e6e4fedc70f65bc874c6d..a33bed4e7f000de74e5de3eb960a05442c954bea 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-24  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/56403
+	* g++.dg/torture/pr56403.C: New test.
+
 2013-02-25  Catherine Moore  <clm@codesourcery.com>
 
 	Revert:
diff --git a/gcc/testsuite/g++.dg/torture/pr56403.C b/gcc/testsuite/g++.dg/torture/pr56403.C
new file mode 100644
index 0000000000000000000000000000000000000000..27b6eeb88882889cf0cbde41e48f6cbe1810a0cf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr56403.C
@@ -0,0 +1,12 @@
+// PR c++/56403
+// { dg-do compile }
+
+#include <stdarg.h>
+
+struct S { va_list err_args; };
+
+void *
+foo ()
+{
+  return new S ();
+}