Fixup object layout when we have a primary base (it goes first).  Start preping for
virtual base layout.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78265 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGenCXX/virt.cpp b/test/CodeGenCXX/virt.cpp
index 55c9b5d..0d43b80 100644
--- a/test/CodeGenCXX/virt.cpp
+++ b/test/CodeGenCXX/virt.cpp
@@ -7,6 +7,7 @@
 struct B {
   virtual void bar1();
   virtual void bar2();
+  int b;
 };
 void B::bar1() { }
 void B::bar2() { }
@@ -18,22 +19,42 @@
 void C::bee1() { }
 void C::bee2() { }
 
-static_assert (sizeof (B) == (sizeof(void *)), "vtable pointer layout");
+struct D {
+  virtual void boo();
+};
+void D::boo() { }
 
-class A : public B, public C {
+struct E {
+  int e;
+};
+
+static_assert (sizeof (C) == (sizeof(void *)), "vtable pointer layout");
+
+class A : public E, public B, public C, /* virtual */ public D {
 public:
   virtual void foo1();
   virtual void foo2();
   A() { }
-} *a;
+  int a;
+} *ap;
 void A::foo1() { }
 void A::foo2() { }
 
 int main() {
   A a;
   B b;
+  ap->e = 1;
+  ap->b = 2;
 }
 
+// CHECK-LP32: main:
+// CHECK-LP32: movl $1, 8(%eax)
+// CHECK-LP32: movl $2, 4(%eax)
+
+// CHECK-LP64: main:
+// CHECK-LP64: movl $1, 12(%rax)
+// CHECK-LP64: movl $2, 8(%rax)
+
 // CHECK-LP64: __ZTV1B:
 // CHECK-LP64: .space 8
 // CHECK-LP64: .space 8
@@ -53,7 +74,7 @@
 // CHECK-LP64: .quad __ZN1B4bar2Ev
 // CHECK-LP64: .quad __ZN1A4foo1Ev
 // CHECK-LP64: .quad __ZN1A4foo2Ev
-// CHECK-LP64: .quad 18446744073709551608
+// CHECK-LP64: .quad 18446744073709551600
 // CHECK-LP64: .space 8
 // CHECK-LP64: .quad __ZN1C4bee1Ev
 // CHECK-LP64: .quad __ZN1C4bee2Ev
@@ -65,7 +86,7 @@
 // CHECK-LP32: .long __ZN1B4bar2Ev
 // CHECK-LP32: .long __ZN1A4foo1Ev
 // CHECK-LP32: .long __ZN1A4foo2Ev
-// CHECK-LP32: .long 4294967292
+// CHECK-LP32: .long 4294967284
 // CHECK-LP32: .space 4
 // CHECK-LP32: .long __ZN1C4bee1Ev
 // CHECK-LP32: .long __ZN1C4bee2Ev