class.c (override_one_vtable): Adjust the use of BINFO_VIRTUALS here too.

	* class.c (override_one_vtable): Adjust the use of BINFO_VIRTUALS
	here too.

From-SVN: r28301

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f3e9d0015ee25f72d04f08db03ba118ddd64d8d7..43e8986ab8c2aac3f926b0412b4907a34168299b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 1999-07-27  Mark Mitchell  <mark@codesourcery.com>
 
+       * class.c (override_one_vtable): Adjust the use of BINFO_VIRTUALS
+       here too.
+
        * cp-tree.h (BINFO_VIRTUALS): Document new format.
        * class.c (modify_one_vtable): Change prototype accordingly.
        (modify_all_vtables): Likewise.
@@ -15,6 +18,7 @@
        (fixup_vtable_deltas): Likewise.
        (override_one_vtable): Likewise.
        (finish_struct_1): Likewise.
+
        * error.c (dump_expr): Likewise.
        * search.c (get_abstract_virtuals_1): Likewise.
        (get_abstract_virtuals): Likewise.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 4207d8f73e273752841f95110c8d15d09561fddd..1b02b9ac781c7dd42618b2361e096a89a81ed1db 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -2836,8 +2836,8 @@ override_one_vtable (binfo, old, t)
 
            /* We can use integer_zero_node, as we will core dump
               if this is used anyway.  */
-           TREE_VALUE (virtuals) = build_vtable_entry (integer_zero_node, 
-                                                       fndecl);
+           TREE_PURPOSE (virtuals) = integer_zero_node;
+           TREE_VALUE (virtuals) = fndecl;
          }
        }
       virtuals = TREE_CHAIN (virtuals);