diff options
| author | steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-24 07:20:42 +0000 |
|---|---|---|
| committer | steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-24 07:20:42 +0000 |
| commit | b7837065e4ec51e8a0ed5fdb0303f2273d3a5d92 (patch) | |
| tree | 5e7a25d8aa7a9331ab052a5f2209c65c048a4ef2 /gcc/cp/init.c | |
| parent | b48b15fd2e8bc47a324446a830b492e3c884e83f (diff) | |
| download | gcc-b7837065e4ec51e8a0ed5fdb0303f2273d3a5d92.tar.gz | |
* typeck.c (comptypes): First determine if the types are compatible
from a target-independent point of view. Check target attributes
last.
* class.c (build_base_path):
(build_vbase_offset_vtbl_entries):
(add_vcall_offset): Replace fold (buildN (...)) with fold_buildN.
* error.c (dump_expr): Likewise.
* init.c (build_zero_init, expand_cleanup_for_base,
build_vec_delete_1): Likewise.
* mangle.c (write_integer_cst): Likewise.
* method.c (thunk_adjust): Likewise.
* pt.c (convert_nontype_argument, tsubst, unify): Likewise.
* tree.c (cxx_print_statistics, array_type_nelts_total): Likewise.
* typeck.c (build_ptrmemfunc_access_expr,
(get_member_function_from_ptrfunc): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96985 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/init.c')
| -rw-r--r-- | gcc/cp/init.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c index ddf39bfd690..69089fe8269 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -222,8 +222,8 @@ build_zero_init (tree type, tree nelts, bool static_storage_p) /* Iterate over the array elements, building initializations. */ inits = NULL_TREE; if (nelts) - max_index = fold (build2 (MINUS_EXPR, TREE_TYPE (nelts), - nelts, integer_one_node)); + max_index = fold_build2 (MINUS_EXPR, TREE_TYPE (nelts), + nelts, integer_one_node); else max_index = array_type_nelts (type); gcc_assert (TREE_CODE (max_index) == INTEGER_CST); @@ -826,9 +826,9 @@ expand_cleanup_for_base (tree binfo, tree flag) binfo, LOOKUP_NORMAL | LOOKUP_NONVIRTUAL); if (flag) - expr = fold (build3 (COND_EXPR, void_type_node, - c_common_truthvalue_conversion (flag), - expr, integer_zero_node)); + expr = fold_build3 (COND_EXPR, void_type_node, + c_common_truthvalue_conversion (flag), + expr, integer_zero_node); finish_eh_cleanup (expr); } @@ -2241,9 +2241,9 @@ build_vec_delete_1 (tree base, tree maxindex, tree type, tbase = create_temporary_var (ptype); tbase_init = build_modify_expr (tbase, NOP_EXPR, - fold (build2 (PLUS_EXPR, ptype, - base, - virtual_size))); + fold_build2 (PLUS_EXPR, ptype, + base, + virtual_size)); DECL_REGISTER (tbase) = 1; controller = build3 (BIND_EXPR, void_type_node, tbase, NULL_TREE, NULL_TREE); @@ -2308,11 +2308,11 @@ build_vec_delete_1 (tree base, tree maxindex, tree type, body = integer_zero_node; /* Outermost wrapper: If pointer is null, punt. */ - body = fold (build3 (COND_EXPR, void_type_node, - fold (build2 (NE_EXPR, boolean_type_node, base, - convert (TREE_TYPE (base), - integer_zero_node))), - body, integer_zero_node)); + body = fold_build3 (COND_EXPR, void_type_node, + fold_build2 (NE_EXPR, boolean_type_node, base, + convert (TREE_TYPE (base), + integer_zero_node)), + body, integer_zero_node); body = build1 (NOP_EXPR, void_type_node, body); if (controller) |