* cp-tree.h (build_delete): Change prototype.

	(build_vec_delete): Likewise.
	* call.c (build_scoped_method_call): Use special_function_kind
	values to indicate the kind of destruction to be done.
	(build_method_call): Likewise.
	* decl.c (finish_destructor_body): Likewise.
	(maybe_build_cleanup_1): Likewise.  Rename to ...
	(maybe_build_cleanup): ... this.
	* decl2.c (delete_sanity): Use special_function_kind
	values to indicate the kind of destruction to be done.
	(build_cleanup): Likewise.
	* init.c (perform_member_init): Likewise.
	(build_vec_delete_1): Likewise.
	(build_dtor_call): Simplify.
	(build_delete): Use special_function_kind
	values to indicate the kind of destruction to be done.
	(build_vbase_delete): Likewise.
	(build_vec_delete): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34147 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 3 insertions, 2 deletions

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 05251bbb9bd..93feaddd9e2 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -309,7 +309,8 @@ build_scoped_method_call (exp, basetype, name, parms)
 	  if (! TYPE_HAS_DESTRUCTOR (TREE_TYPE (decl)))
 	    return cp_convert (void_type_node, exp);
 	  
-	  return build_delete (TREE_TYPE (decl), decl, integer_two_node,
+	  return build_delete (TREE_TYPE (decl), decl, 
+			       sfk_complete_destructor,
 			       LOOKUP_NORMAL|LOOKUP_NONVIRTUAL|LOOKUP_DESTRUCTOR,
 			       0);
 	}
@@ -516,7 +517,7 @@ build_method_call (instance, name, parms, basetype_path, flags)
       instance = default_conversion (instance);
       instance_ptr = build_unary_op (ADDR_EXPR, instance, 0);
       return build_delete (build_pointer_type (basetype),
-			   instance_ptr, integer_two_node,
+			   instance_ptr, sfk_complete_destructor,
 			   LOOKUP_NORMAL|LOOKUP_DESTRUCTOR, 0);
     }