tree.c (build_aggr_init_expr): Always return error_mark_node on abstract violation.

	* tree.c (build_aggr_init_expr): Always return error_mark_node
	on abstract violation.

From-SVN: r172144

gcc/cp/ChangeLog

 2011-04-07  Jason Merrill  <jason@redhat.com>
 
+	* tree.c (build_aggr_init_expr): Always return error_mark_node
+	on abstract violation.
+
 	PR c++/48450
 	* tree.c (build_cplus_new, build_aggr_init_expr): Take complain.
 	(bot_manip): Adjust.

gcc/cp/tree.c

@@ -382,8 +382,7 @@ build_aggr_init_expr (tree type, tree init, tsubst_flags_t complain)
 
   /* Make sure that we're not trying to create an instance of an
      abstract class.  */
-  if (abstract_virtuals_error_sfinae (NULL_TREE, type, complain)
-      && !(complain & tf_error))
+  if (abstract_virtuals_error_sfinae (NULL_TREE, type, complain))
     return error_mark_node;
 
   if (TREE_CODE (init) == CALL_EXPR)