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/method.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/method.c')
| -rw-r--r-- | gcc/cp/method.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 7a99c262471..70d664283bb 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -220,8 +220,8 @@ thunk_adjust (tree ptr, bool this_adjusting, { if (this_adjusting) /* Adjust the pointer by the constant. */ - ptr = fold (build2 (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,13 +242,13 @@ thunk_adjust (tree ptr, bool this_adjusting, /* Get the offset itself. */ vtable = build1 (INDIRECT_REF, TREE_TYPE (TREE_TYPE (vtable)), vtable); /* Adjust the `this' pointer. */ - ptr = fold (build2 (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 (build2 (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; } |