search.c (expand_upcast_fixups): Tweak to match 1998-10-07 change to vtable types.

	* search.c (expand_upcast_fixups): Tweak to match 1998-10-07
	change to vtable types.

From-SVN: r22959

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b781ad1afa934d1ae1b16e47f9d6efb315151ad8..f2959684cd348899e6fe0a05db5f6421d40169b2 100644 (file)
--- 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 5f157029ecaf96aefde0d0faf2072473c6225c1d..be6cffc9757cbf988c808167c51fe16d0a2aef8d 100644 (file)
--- 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);