diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/search.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b781ad1..f295968 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 1998-10-09 Mark Mitchell <mark@markmitchell.com> + * search.c (expand_upcast_fixups): Tweak to match 1998-10-07 + change to vtable types. + * cvt.c (ocp_convert): Avoid infinite recursion caused by 1998-10-03 change. diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 5f15702..be6cffc 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -2557,8 +2557,7 @@ expand_upcast_fixups (binfo, addr, orig_addr, vbase, vbase_addr, t, (build_indirect_ref (addr, NULL_PTR), DECL_CONTEXT (CLASSTYPE_VFIELD (BINFO_TYPE (binfo)))); expand_expr_stmt - (build_modify_expr (ref, NOP_EXPR, - build_unary_op (ADDR_EXPR, nvtbl, 0))); + (build_modify_expr (ref, NOP_EXPR, nvtbl)); } assemble_external (vtbl); aref = build_array_ref (vtbl, idx); |