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

gcc/cp/ChangeLog

 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.
 

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);