Implements 64 bit microsoft record layout and adds lit tests to cover

it.  Also removes all of the microsoft C++ ABI related code from the 
itanium layout builder.

Differential Revision: http://llvm-reviews.chandlerc.com/D2003

llvm-svn: 193290

1 files changed, 266 insertions, 0 deletions

diff --git a/clang/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp b/clang/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp
index ec777941282..7dd3fad5bf4 100644
--- a/clang/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp
+++ b/clang/test/Layout/ms-x86-lazy-empty-nonvirtual-base.cpp
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple i686-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
 // RUN:            | FileCheck %s
+// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -triple x86_64-pc-win32 -fdump-record-layouts -fsyntax-only -cxx-abi microsoft %s 2>/dev/null \
+// RUN:            | FileCheck %s -check-prefix CHECK-X64
 
 extern "C" int printf(const char *fmt, ...);
 
@@ -39,6 +41,16 @@ struct AA : B8, B1, virtual B0 {
 // CHECK:   20 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=20, align=4
 // CHECK:      |  nvsize=20, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AA
+// CHECK-X64:    0 |   struct B8 (base)
+// CHECK-X64:    0 |     char [5] c
+// CHECK-X64:   17 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AA vbtable pointer)
+// CHECK-X64:   20 |   int a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AB : B8, B1, virtual B0 {
 	short a;
@@ -55,6 +67,16 @@ struct AB : B8, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AB
+// CHECK-X64:    0 |   struct B8 (base)
+// CHECK-X64:    0 |     char [5] c
+// CHECK-X64:   17 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AB vbtable pointer)
+// CHECK-X64:   18 |   short a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AC : B8, B1, virtual B0 {
 	char a;
@@ -71,6 +93,16 @@ struct AC : B8, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AC
+// CHECK-X64:    0 |   struct B8 (base)
+// CHECK-X64:    0 |     char [5] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AC vbtable pointer)
+// CHECK-X64:   16 |   char a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AD : B8, B1, virtual B0 {
 	AD() { printf("AD = %p\n", this); }
@@ -85,6 +117,15 @@ struct AD : B8, B1, virtual B0 {
 // CHECK:   12 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=12, align=4
 // CHECK:      |  nvsize=12, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AD
+// CHECK-X64:    0 |   struct B8 (base)
+// CHECK-X64:    0 |     char [5] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AD vbtable pointer)
+// CHECK-X64:   16 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=16, align=8
+// CHECK-X64:      |  nvsize=16, nvalign=8]
 
 struct AA1 : B9, B1, virtual B0 {
 	int a;
@@ -101,6 +142,16 @@ struct AA1 : B9, B1, virtual B0 {
 // CHECK:   20 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=20, align=4
 // CHECK:      |  nvsize=20, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AA1
+// CHECK-X64:    0 |   struct B9 (base)
+// CHECK-X64:    0 |     char [6] c
+// CHECK-X64:   18 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AA1 vbtable pointer)
+// CHECK-X64:   20 |   int a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AB1 : B9, B1, virtual B0 {
 	short a;
@@ -117,6 +168,16 @@ struct AB1 : B9, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AB1
+// CHECK-X64:    0 |   struct B9 (base)
+// CHECK-X64:    0 |     char [6] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AB1 vbtable pointer)
+// CHECK-X64:   16 |   short a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AC1 : B9, B1, virtual B0 {
 	char a;
@@ -133,6 +194,16 @@ struct AC1 : B9, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AC1
+// CHECK-X64:    0 |   struct B9 (base)
+// CHECK-X64:    0 |     char [6] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AC1 vbtable pointer)
+// CHECK-X64:   16 |   char a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AD1 : B9, B1, virtual B0 {
 	AD1() { printf("AD1 = %p\n", this); }
@@ -147,6 +218,15 @@ struct AD1 : B9, B1, virtual B0 {
 // CHECK:   12 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=12, align=4
 // CHECK:      |  nvsize=12, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AD1
+// CHECK-X64:    0 |   struct B9 (base)
+// CHECK-X64:    0 |     char [6] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AD1 vbtable pointer)
+// CHECK-X64:   16 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=16, align=8
+// CHECK-X64:      |  nvsize=16, nvalign=8]
 
 struct AA2 : B10, B1, virtual B0 {
 	int a;
@@ -163,6 +243,16 @@ struct AA2 : B10, B1, virtual B0 {
 // CHECK:   20 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=20, align=4
 // CHECK:      |  nvsize=20, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AA2
+// CHECK-X64:    0 |   struct B10 (base)
+// CHECK-X64:    0 |     char [7] c
+// CHECK-X64:   19 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AA2 vbtable pointer)
+// CHECK-X64:   20 |   int a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AB2 : B10, B1, virtual B0 {
 	short a;
@@ -179,6 +269,16 @@ struct AB2 : B10, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AB2
+// CHECK-X64:    0 |   struct B10 (base)
+// CHECK-X64:    0 |     char [7] c
+// CHECK-X64:   17 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AB2 vbtable pointer)
+// CHECK-X64:   18 |   short a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AC2 : B10, B1, virtual B0 {
 	char a;
@@ -195,6 +295,16 @@ struct AC2 : B10, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AC2
+// CHECK-X64:    0 |   struct B10 (base)
+// CHECK-X64:    0 |     char [7] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AC2 vbtable pointer)
+// CHECK-X64:   16 |   char a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AD2 : B10, B1, virtual B0 {
 	AD2() { printf("AD2 = %p\n", this); }
@@ -209,6 +319,15 @@ struct AD2 : B10, B1, virtual B0 {
 // CHECK:   12 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=12, align=4
 // CHECK:      |  nvsize=12, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AD2
+// CHECK-X64:    0 |   struct B10 (base)
+// CHECK-X64:    0 |     char [7] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AD2 vbtable pointer)
+// CHECK-X64:   16 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=16, align=8
+// CHECK-X64:      |  nvsize=16, nvalign=8]
 
 struct AA3 : B11, B1, virtual B0 {
 	int a;
@@ -225,6 +344,16 @@ struct AA3 : B11, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AA3
+// CHECK-X64:    0 |   struct B11 (base)
+// CHECK-X64:    0 |     char [8] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AA3 vbtable pointer)
+// CHECK-X64:   16 |   int a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AB3 : B11, B1, virtual B0 {
 	short a;
@@ -241,6 +370,16 @@ struct AB3 : B11, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AB3
+// CHECK-X64:    0 |   struct B11 (base)
+// CHECK-X64:    0 |     char [8] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AB3 vbtable pointer)
+// CHECK-X64:   16 |   short a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AC3 : B11, B1, virtual B0 {
 	char a;
@@ -257,6 +396,16 @@ struct AC3 : B11, B1, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AC3
+// CHECK-X64:    0 |   struct B11 (base)
+// CHECK-X64:    0 |     char [8] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AC3 vbtable pointer)
+// CHECK-X64:   16 |   char a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct AD3 : B11, B1, virtual B0 {
 	AD3() { printf("AD3 = %p\n", this); }
@@ -271,6 +420,15 @@ struct AD3 : B11, B1, virtual B0 {
 // CHECK:   12 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=12, align=4
 // CHECK:      |  nvsize=12, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AD3
+// CHECK-X64:    0 |   struct B11 (base)
+// CHECK-X64:    0 |     char [8] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (AD3 vbtable pointer)
+// CHECK-X64:   16 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=16, align=8
+// CHECK-X64:      |  nvsize=16, nvalign=8]
 
 struct B : B1, B2, virtual B0 {
 	B() { printf("B = %p\n", this); }
@@ -284,6 +442,14 @@ struct B : B1, B2, virtual B0 {
 // CHECK:    8 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=8, align=4
 // CHECK:      |  nvsize=8, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct B
+// CHECK-X64:    0 |   struct B1 (base) (empty)
+// CHECK-X64:   16 |   struct B2 (base) (empty)
+// CHECK-X64:    8 |   (B vbtable pointer)
+// CHECK-X64:   16 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=16, align=8
+// CHECK-X64:      |  nvsize=16, nvalign=8]
 
 struct C : B1, B2, B3, virtual B0 {
 	char a;
@@ -300,6 +466,16 @@ struct C : B1, B2, B3, virtual B0 {
 // CHECK:   12 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=12, align=4
 // CHECK:      |  nvsize=12, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct C
+// CHECK-X64:    0 |   struct B1 (base) (empty)
+// CHECK-X64:    1 |   struct B2 (base) (empty)
+// CHECK-X64:   16 |   struct B3 (base) (empty)
+// CHECK-X64:    8 |   (C vbtable pointer)
+// CHECK-X64:   16 |   char a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct D : B1, B2, B3, B4, B5, virtual B0 {
 	int a;
@@ -318,6 +494,18 @@ struct D : B1, B2, B3, B4, B5, virtual B0 {
 // CHECK:   12 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=12, align=4
 // CHECK:      |  nvsize=12, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct D
+// CHECK-X64:    0 |   struct B1 (base) (empty)
+// CHECK-X64:    1 |   struct B2 (base) (empty)
+// CHECK-X64:    2 |   struct B3 (base) (empty)
+// CHECK-X64:    3 |   struct B4 (base) (empty)
+// CHECK-X64:   16 |   struct B5 (base) (empty)
+// CHECK-X64:    8 |   (D vbtable pointer)
+// CHECK-X64:   16 |   int a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct E : B1, B6, B3, B4, B5, virtual B0 {
 	int a;
@@ -336,6 +524,18 @@ struct E : B1, B6, B3, B4, B5, virtual B0 {
 // CHECK:   20 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=20, align=4
 // CHECK:      |  nvsize=20, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct E
+// CHECK-X64:    0 |   struct B1 (base) (empty)
+// CHECK-X64:    2 |   struct B6 (base) (empty)
+// CHECK-X64:    3 |   struct B3 (base) (empty)
+// CHECK-X64:    4 |   struct B4 (base) (empty)
+// CHECK-X64:   17 |   struct B5 (base) (empty)
+// CHECK-X64:    8 |   (E vbtable pointer)
+// CHECK-X64:   20 |   int a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct F : B1, B6, B4, B8, B5, virtual B0 {
 	int a;
@@ -355,6 +555,19 @@ struct F : B1, B6, B4, B8, B5, virtual B0 {
 // CHECK:   16 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct F
+// CHECK-X64:    0 |   struct B1 (base) (empty)
+// CHECK-X64:    2 |   struct B6 (base) (empty)
+// CHECK-X64:    3 |   struct B4 (base) (empty)
+// CHECK-X64:    3 |   struct B8 (base)
+// CHECK-X64:    3 |     char [5] c
+// CHECK-X64:   16 |   struct B5 (base) (empty)
+// CHECK-X64:    8 |   (F vbtable pointer)
+// CHECK-X64:   16 |   int a
+// CHECK-X64:   24 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 struct G : B8, B1, virtual B0 {
 	int a;
@@ -373,6 +586,17 @@ struct G : B8, B1, virtual B0 {
 // CHECK:   48 |   struct B0 (virtual base) (empty)
 // CHECK:      | [sizeof=48, align=16
 // CHECK:      |  nvsize=48, nvalign=16]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct G
+// CHECK-X64:    0 |   struct B8 (base)
+// CHECK-X64:    0 |     char [5] c
+// CHECK-X64:   16 |   struct B1 (base) (empty)
+// CHECK-X64:    8 |   (G vbtable pointer)
+// CHECK-X64:   16 |   int a
+// CHECK-X64:   32 |   int a1
+// CHECK-X64:   48 |   struct B0 (virtual base) (empty)
+// CHECK-X64:      | [sizeof=48, align=16
+// CHECK-X64:      |  nvsize=48, nvalign=16]
 
 struct AX : B1X, B2X, B3X, B4X, virtual B0X {
 	int a;
@@ -390,6 +614,17 @@ struct AX : B1X, B2X, B3X, B4X, virtual B0X {
 // CHECK:   48 |   struct B0X (virtual base) (empty)
 // CHECK:      | [sizeof=48, align=16
 // CHECK:      |  nvsize=48, nvalign=16]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct AX
+// CHECK-X64:    0 |   struct B1X (base) (empty)
+// CHECK-X64:   16 |   struct B2X (base) (empty)
+// CHECK-X64:   18 |   struct B3X (base) (empty)
+// CHECK-X64:   33 |   struct B4X (base) (empty)
+// CHECK-X64:   24 |   (AX vbtable pointer)
+// CHECK-X64:   36 |   int a
+// CHECK-X64:   48 |   struct B0X (virtual base) (empty)
+// CHECK-X64:      | [sizeof=48, align=16
+// CHECK-X64:      |  nvsize=48, nvalign=16]
 
 struct BX : B2X, B1X, B3X, B4X, virtual B0X {
 	int a;
@@ -407,6 +642,17 @@ struct BX : B2X, B1X, B3X, B4X, virtual B0X {
 // CHECK:   32 |   struct B0X (virtual base) (empty)
 // CHECK:      | [sizeof=32, align=16
 // CHECK:      |  nvsize=32, nvalign=16]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct BX
+// CHECK-X64:    0 |   struct B2X (base) (empty)
+// CHECK-X64:    1 |   struct B1X (base) (empty)
+// CHECK-X64:    2 |   struct B3X (base) (empty)
+// CHECK-X64:   17 |   struct B4X (base) (empty)
+// CHECK-X64:    8 |   (BX vbtable pointer)
+// CHECK-X64:   20 |   int a
+// CHECK-X64:   32 |   struct B0X (virtual base) (empty)
+// CHECK-X64:      | [sizeof=32, align=16
+// CHECK-X64:      |  nvsize=32, nvalign=16]
 
 struct CX : B1X, B3X, B2X, virtual B0X {
 	int a;
@@ -423,6 +669,16 @@ struct CX : B1X, B3X, B2X, virtual B0X {
 // CHECK:   48 |   struct B0X (virtual base) (empty)
 // CHECK:      | [sizeof=48, align=16
 // CHECK:      |  nvsize=48, nvalign=16]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct CX
+// CHECK-X64:    0 |   struct B1X (base) (empty)
+// CHECK-X64:    2 |   struct B3X (base) (empty)
+// CHECK-X64:   32 |   struct B2X (base) (empty)
+// CHECK-X64:    8 |   (CX vbtable pointer)
+// CHECK-X64:   32 |   int a
+// CHECK-X64:   48 |   struct B0X (virtual base) (empty)
+// CHECK-X64:      | [sizeof=48, align=16
+// CHECK-X64:      |  nvsize=48, nvalign=16]
 
 struct DX : B8X, B1X, virtual B0X {
 	int a;
@@ -439,6 +695,16 @@ struct DX : B8X, B1X, virtual B0X {
 // CHECK:   16 |   struct B0X (virtual base) (empty)
 // CHECK:      | [sizeof=16, align=4
 // CHECK:      |  nvsize=16, nvalign=4]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64:    0 | struct DX
+// CHECK-X64:    0 |   struct B8X (base)
+// CHECK-X64:    0 |     short a
+// CHECK-X64:   18 |   struct B1X (base) (empty)
+// CHECK-X64:    8 |   (DX vbtable pointer)
+// CHECK-X64:   20 |   int a
+// CHECK-X64:   24 |   struct B0X (virtual base) (empty)
+// CHECK-X64:      | [sizeof=24, align=8
+// CHECK-X64:      |  nvsize=24, nvalign=8]
 
 int a[
 sizeof(AA)+