1 files changed, 97 insertions, 0 deletions
diff --git a/clang/test/Layout/ms-x86-vtordisp.cpp b/clang/test/Layout/ms-x86-vtordisp.cpp
new file mode 100644
index 00000000000..45ac6496821
--- /dev/null
+++ b/clang/test/Layout/ms-x86-vtordisp.cpp
@@ -0,0 +1,97 @@
+// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>&1 \
+// RUN:            | FileCheck %s
+
+extern "C" int printf(const char *fmt, ...);
+
+struct B0 {
+	int a;
+	B0() : a(0xf00000B0) {}
+	virtual void f() { printf("B0"); }
+};
+
+struct __declspec(align(16)) B1 {
+	int a;
+	B1() : a(0xf00000B1) {}
+	virtual void f() { printf("B1"); }
+};
+
+struct __declspec(align(16)) Align16 {};
+struct __declspec(align(32)) Align32 {};
+struct VAlign16 : virtual Align16 {};
+struct VAlign32 : virtual Align32 {};
+
+struct A : virtual B0, virtual B1 {
+	int a;
+	A() : a(0xf000000A) {}
+	virtual void f() { printf("A"); }
+	virtual void g() { printf("A"); }
+};
+
+// CHECK: *** Dumping AST Record Layout
+// CHECK:    0 | struct A
+// CHECK:    0 |   (A vftable pointer)
+// CHECK:    4 |   (A vbtable pointer)
+// CHECK:    8 |   int a
+// CHECK:   16 |   (vtordisp for vbase B0)
+// CHECK:   20 |   struct B0 (virtual base)
+// CHECK:   20 |     (B0 vftable pointer)
+// CHECK:   24 |     int a
+// CHECK:   44 |   (vtordisp for vbase B1)
+// CHECK:   48 |   struct B1 (virtual base)
+// CHECK:   48 |     (B1 vftable pointer)
+// CHECK:   52 |     int a
+// CHECK:      | [sizeof=64, align=16
+// CHECK:      |  nvsize=12, nvalign=4]
+
+struct C : virtual B0, virtual B1, VAlign32 {
+	int a;
+	C() : a(0xf000000C) {}
+	virtual void f() { printf("C"); }
+	virtual void g() { printf("C"); }
+};
+
+// CHECK: *** Dumping AST Record Layout
+// CHECK:    0 | struct C
+// CHECK:    0 |   (C vftable pointer)
+// CHECK:   32 |   struct VAlign32 (base)
+// CHECK:   32 |     (VAlign32 vbtable pointer)
+// CHECK:   36 |   int a
+// CHECK:   64 |   (vtordisp for vbase B0)
+// CHECK:   68 |   struct B0 (virtual base)
+// CHECK:   68 |     (B0 vftable pointer)
+// CHECK:   72 |     int a
+// CHECK:  108 |   (vtordisp for vbase B1)
+// CHECK:  112 |   struct B1 (virtual base)
+// CHECK:  112 |     (B1 vftable pointer)
+// CHECK:  116 |     int a
+// CHECK:  128 |   struct Align32 (virtual base) (empty)
+// CHECK:      | [sizeof=128, align=32
+// CHECK:      |  nvsize=64, nvalign=32]
+
+struct __declspec(align(32)) D : virtual B0, virtual B1  {
+	int a;
+	D() : a(0xf000000D) {}
+	virtual void f() { printf("D"); }
+	virtual void g() { printf("D"); }
+};
+
+// CHECK: *** Dumping AST Record Layout
+// CHECK:    0 | struct D
+// CHECK:    0 |   (D vftable pointer)
+// CHECK:    4 |   (D vbtable pointer)
+// CHECK:    8 |   int a
+// CHECK:   32 |   (vtordisp for vbase B0)
+// CHECK:   36 |   struct B0 (virtual base)
+// CHECK:   36 |     (B0 vftable pointer)
+// CHECK:   40 |     int a
+// CHECK:   76 |   (vtordisp for vbase B1)
+// CHECK:   80 |   struct B1 (virtual base)
+// CHECK:   80 |     (B1 vftable pointer)
+// CHECK:   84 |     int a
+// CHECK:      | [sizeof=96, align=32
+// CHECK:      |  nvsize=12, nvalign=4]
+
+int a[
+sizeof(A)+
+sizeof(C)+
+sizeof(D)];