From f293ce4b0d14fc523cac7df7169726e5dadaa329 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Mon, 16 Aug 2004 02:08:06 +0000 Subject: call.c (build_vfield_ref, [...]): Replace calls to build with calls to buildN. * 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. From-SVN: r86047 --- gcc/cp/method.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gcc/cp/method.c') diff --git a/gcc/cp/method.c b/gcc/cp/method.c index eb4b64a..13fe0a4 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -224,8 +224,8 @@ thunk_adjust (tree ptr, bool this_adjusting, { if (this_adjusting) /* Adjust the pointer by the constant. */ - ptr = fold (build (PLUS_EXPR, TREE_TYPE (ptr), ptr, - ssize_int (fixed_offset))); + ptr = fold (build2 (PLUS_EXPR, TREE_TYPE (ptr), ptr, + ssize_int (fixed_offset))); /* If there's a virtual offset, look up that value in the vtable and adjust the pointer again. */ @@ -242,17 +242,17 @@ thunk_adjust (tree ptr, bool this_adjusting, /* Form the vtable address. */ vtable = build1 (INDIRECT_REF, TREE_TYPE (TREE_TYPE (vtable)), vtable); /* Find the entry with the vcall offset. */ - vtable = build (PLUS_EXPR, TREE_TYPE (vtable), vtable, virtual_offset); + vtable = build2 (PLUS_EXPR, TREE_TYPE (vtable), vtable, virtual_offset); /* Get the offset itself. */ vtable = build1 (INDIRECT_REF, TREE_TYPE (TREE_TYPE (vtable)), vtable); /* Adjust the `this' pointer. */ - ptr = fold (build (PLUS_EXPR, TREE_TYPE (ptr), ptr, vtable)); + ptr = fold (build2 (PLUS_EXPR, TREE_TYPE (ptr), ptr, vtable)); } if (!this_adjusting) /* Adjust the pointer by the constant. */ - ptr = fold (build (PLUS_EXPR, TREE_TYPE (ptr), ptr, - ssize_int (fixed_offset))); + ptr = fold (build2 (PLUS_EXPR, TREE_TYPE (ptr), ptr, + ssize_int (fixed_offset))); return ptr; } @@ -511,7 +511,7 @@ do_build_copy_constructor (tree fndecl) if *this is a base subobject. */; else if (TYPE_HAS_TRIVIAL_INIT_REF (current_class_type)) { - t = build (INIT_EXPR, void_type_node, current_class_ref, parm); + t = build2 (INIT_EXPR, void_type_node, current_class_ref, parm); finish_expr_stmt (t); } else @@ -584,7 +584,7 @@ do_build_copy_constructor (tree fndecl) expr_type = TREE_TYPE (field); if (TREE_CODE (expr_type) != REFERENCE_TYPE) expr_type = cp_build_qualified_type (expr_type, cvquals); - init = build (COMPONENT_REF, expr_type, init, field, NULL_TREE); + init = build3 (COMPONENT_REF, expr_type, init, field, NULL_TREE); init = build_tree_list (NULL_TREE, init); member_init_list @@ -609,7 +609,7 @@ do_build_assign_ref (tree fndecl) if *this is a base subobject. */; else if (TYPE_HAS_TRIVIAL_ASSIGN_REF (current_class_type)) { - tree t = build (MODIFY_EXPR, void_type_node, current_class_ref, parm); + tree t = build2 (MODIFY_EXPR, void_type_node, current_class_ref, parm); finish_expr_stmt (t); } else @@ -676,17 +676,17 @@ do_build_assign_ref (tree fndecl) else continue; - comp = build (COMPONENT_REF, TREE_TYPE (field), comp, field, - NULL_TREE); - init = build (COMPONENT_REF, - cp_build_qualified_type (TREE_TYPE (field), cvquals), - init, field, NULL_TREE); + comp = build3 (COMPONENT_REF, TREE_TYPE (field), comp, field, + NULL_TREE); + init = build3 (COMPONENT_REF, + cp_build_qualified_type (TREE_TYPE (field), cvquals), + init, field, NULL_TREE); if (DECL_NAME (field)) finish_expr_stmt (build_modify_expr (comp, NOP_EXPR, init)); else - finish_expr_stmt (build (MODIFY_EXPR, TREE_TYPE (comp), comp, - init)); + finish_expr_stmt (build2 (MODIFY_EXPR, TREE_TYPE (comp), comp, + init)); } } finish_return_stmt (current_class_ref); -- cgit v1.1