diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4391a478e9a..f979af5999f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-06  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51431
+	* init.c (build_value_init): Check build_aggr_init_expr return
+	value for error_mark_node.
+
 2011-12-06  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/51427
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 8e28e3b3044..e1eb681de67 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -359,11 +359,9 @@ build_value_init (tree type, tsubst_flags_t complain)
 	  tree ctor = build_special_member_call
 	    (NULL_TREE, complete_ctor_identifier,
 	     NULL, type, LOOKUP_NORMAL, complain);
+	  ctor = build_aggr_init_expr (type, ctor, complain);
 	  if (ctor != error_mark_node)
-	    {
-	      ctor = build_aggr_init_expr (type, ctor, complain);
-	      AGGR_INIT_ZERO_FIRST (ctor) = 1;
-	    }
+	    AGGR_INIT_ZERO_FIRST (ctor) = 1;
 	  return ctor;
 	}
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f4c61d34f9c..ac537cf44e8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-06  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51431
+	* g++.dg/other/abstract3.C: New.
+
 2011-12-06  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/49997
diff --git a/gcc/testsuite/g++.dg/other/abstract3.C b/gcc/testsuite/g++.dg/other/abstract3.C
new file mode 100644
index 00000000000..528b7d79360
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/abstract3.C
@@ -0,0 +1,12 @@
+// PR c++/51431
+
+struct A                  // { dg-message "note" }
+{
+  virtual void foo() = 0; // { dg-message "note" }
+};
+
+struct B
+{
+  A a;           // { dg-error "abstract" }
+  B() : a() {}   // { dg-error "abstract" }
+};