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

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
3cf0ca23 · Jason Merrill · Jason Merrill · 362115a9 · 3cf0ca23 · 3cf0ca23
Commit 3cf0ca23 authored Apr 07, 2011 by Jason Merrill Committed by Jason Merrill Apr 07, 2011
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

gcc/cp/ChangeLog
+3 -0

gcc/cp/tree.c
+1 -2

No files found.
--- a/gcc/cp/ChangeLog
+++ b/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.

--- a/gcc/cp/tree.c
+++ b/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)