From 831d52a2208b4709b5bb6a53c24af8de08e4bd90 Mon Sep 17 00:00:00 2001 From: sayle Date: Mon, 16 Aug 2004 02:08:06 +0000 Subject: * call.c (build_vfield_ref, build_call, build_conditional_expr, convert_arg_to_ellipsis, build_x_va_arg, build_over_call, build_java_interface_fn_ref, build_special_member_call, build_new_method_call, initialize_reference): Replace calls to build with calls to buildN. * class.c (build_base_path, convert_to_base_statically, build_vfn_ref, instantiate_type, dfs_accumulate_vtbl_inits, build_vtbl_initializer): Likewise. * cp-gimplify.c (genericize_try_block, genericize_catch_block, gimplify_if_stmt, cp_genericize_r): Likewise. * cvt.c (convert_to_void): Likewise. * decl.c (check_initializer, finish_constructor_body, finish_destructor_body): Likewise. * error.c (dump_expr): Likewise. * except.c (build_exc_ptr, expand_start_catch_block, build_throw): Likewise. * init.c (perform_member_init, expand_virtual_init, expand_cleanup_for_base, build_init, expand_default_init, build_offset_ref, decl_constant_value, build_new, build_new_1, build_vec_delete_1, build_vec_init, build_delete, push_base_cleanups, build_vec_delete): Likewise. * mangle.c (write_integer_cst): Likewise. * method.c (thunk_adjust, do_build_copy_constructor, do_build_assign_ref): Likewise. * pt.c (lookup_template_function, tsubst, tsubst_copy_and_build, unify, build_non_dependent_expr): Likewise. * rtti.c (build_headof, build_typeid, ifnonnull, build_dyanmic_cast_1, tinfo_base_init): Likewise. * semantics.c (begin_compound_stmt, finish_call_expr, finish_pseudo_destructor_expr, finish_id_expression, simplify_aggr_init_expr, finalize_nrv_r): Likewise. * tree.c (build_target_expr, build_cplus_new, array_type_nelts_top, array_type_nelts_total, stabilize_call): Likewise. * typeck.c (decay_conversion, build_class_member_access_expr, lookup_destructor, build_ptrmemfunc_access_expr, build_array_ref, get_member_function_from_ptrfunc, build_binary_op, pointer_diff, build_x_unary_op, build_unary_op, unary_complex_lvalue, build_compound_expr, build_modify_expr, expand_ptrmemfunc_cst, check_return_expr): Likewise. * typeck2.c (split_nonconstant_1, split_nonconstant_init_1, split_nonconstant_init, store_init_value, build_m_component_ref): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86047 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/except.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gcc/cp/except.c') diff --git a/gcc/cp/except.c b/gcc/cp/except.c index fd8b054edd5..e572aa7128b 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -150,7 +150,7 @@ build_eh_type_type (tree type) tree build_exc_ptr (void) { - return build (EXC_PTR_EXPR, ptr_type_node); + return build0 (EXC_PTR_EXPR, ptr_type_node); } /* Build up a call to __cxa_begin_catch, to tell the runtime that the @@ -407,8 +407,8 @@ expand_start_catch_block (tree decl) generic exception header. */ init = build_exc_ptr (); init = build1 (NOP_EXPR, build_pointer_type (type), init); - init = build (MINUS_EXPR, TREE_TYPE (init), init, - TYPE_SIZE_UNIT (TREE_TYPE (init))); + init = build2 (MINUS_EXPR, TREE_TYPE (init), init, + TYPE_SIZE_UNIT (TREE_TYPE (init))); init = build_indirect_ref (init, NULL); is_java = true; } @@ -689,13 +689,13 @@ build_throw (tree exp) stabilize_init (exp, &temp_expr); if (elided) - exp = build (TRY_CATCH_EXPR, void_type_node, exp, - do_free_exception (ptr)); + exp = build2 (TRY_CATCH_EXPR, void_type_node, exp, + do_free_exception (ptr)); else exp = build1 (MUST_NOT_THROW_EXPR, void_type_node, exp); /* Prepend the allocation. */ - exp = build (COMPOUND_EXPR, TREE_TYPE (exp), allocate_expr, exp); + exp = build2 (COMPOUND_EXPR, TREE_TYPE (exp), allocate_expr, exp); if (temp_expr) { /* Prepend the calculation of the throw expression. Also, force @@ -704,7 +704,7 @@ build_throw (tree exp) them in MUST_NOT_THROW_EXPR, since they are run after the exception object is initialized. */ walk_tree_without_duplicates (&temp_expr, wrap_cleanups_r, 0); - exp = build (COMPOUND_EXPR, TREE_TYPE (exp), temp_expr, exp); + exp = build2 (COMPOUND_EXPR, TREE_TYPE (exp), temp_expr, exp); exp = build1 (CLEANUP_POINT_EXPR, TREE_TYPE (exp), exp); } @@ -730,7 +730,7 @@ build_throw (tree exp) tmp = build_function_call (fn, tmp); /* Tack on the initialization stuff. */ - exp = build (COMPOUND_EXPR, TREE_TYPE (tmp), exp, tmp); + exp = build2 (COMPOUND_EXPR, TREE_TYPE (tmp), exp, tmp); } else { -- cgit v1.2.1