class.c (layout_class_type): Add pointers to virtual bases after base classes under...

	* class.c (layout_class_type): Add pointers to virtual bases after
	base classes under the old ABI.

From-SVN: r34961

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0fe79fea7ba325215e71ddbb3ac5ca4a5e5cf625..19419735cc9b3c0c24a730c9901005dfb3a1adad 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-11  Mark Mitchell  <mark@codesourcery.com>
+
+       * class.c (layout_class_type): Add pointers to virtual bases after
+       base classes under the old ABI.
+
 2000-07-10  Benjamin Chelf  <chelf@codesourcery.com>
 
        * semantics.c (finish_for_stmt): Remove call to emit_line_note.

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 2ec325ba2998fe36b372b8892a410691a3006fba..94da8a02f0772482a74163323b9a4075d4df6dfe 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4795,11 +4795,11 @@ layout_class_type (t, empty_p, vfuns_p,
       place_field (rli, vptr);
     }
 
+  /* Build FIELD_DECLs for all of the non-virtual base-types.  */
+  v = build_base_fields (rli, empty_p);
   /* Add pointers to all of our virtual base-classes.  */
   TYPE_FIELDS (t) = chainon (build_vbase_pointer_fields (rli, empty_p),
                             TYPE_FIELDS (t));
-  /* Build FIELD_DECLs for all of the non-virtual base-types.  */
-  v = build_base_fields (rli, empty_p);
 
   /* CLASSTYPE_INLINE_FRIENDS is really TYPE_NONCOPIED_PARTS.  Thus,
      we have to save this before we start modifying