From 29a2b955fb9c63b06a47f590cd7287e6ab8b5230 Mon Sep 17 00:00:00 2001 From: Warren Hunt Date: Fri, 11 Apr 2014 00:14:09 +0000 Subject: [MS-ABI] Update virtual base padding rules to match MSVC 10+ In version 9 (VS2010) (and prior)? versions of msvc, if the last field in a record was a bitfield padding equal to the size of the storage class of that bitfield was added before each vbase and vtordisp. This patch removes that feature from clang and updates the lit tests to reflect it. llvm-svn: 206004 --- clang/test/Layout/ms-x86-pack-and-align.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'clang/test/Layout/ms-x86-pack-and-align.cpp') diff --git a/clang/test/Layout/ms-x86-pack-and-align.cpp b/clang/test/Layout/ms-x86-pack-and-align.cpp index 0843b3e0bfe..be0499c2cbb 100644 --- a/clang/test/Layout/ms-x86-pack-and-align.cpp +++ b/clang/test/Layout/ms-x86-pack-and-align.cpp @@ -473,7 +473,7 @@ struct RE { // CHECK-NEXT: 0 | struct RB2 // CHECK-NEXT: 0 | (RB2 vbtable pointer) // CHECK-NEXT: 1024 | int b -// CHECK-NEXT: 1032 | struct RA (virtual base) (empty) +// CHECK-NEXT: 1028 | struct RA (virtual base) (empty) // CHECK-NEXT: | [sizeof=1032, align=1024 // CHECK-NEXT: | nvsize=1028, nvalign=1024] // CHECK: *** Dumping AST Record Layout @@ -481,7 +481,7 @@ struct RE { // CHECK-NEXT: 0 | (RB3 vftable pointer) // CHECK-NEXT: 1024 | (RB3 vbtable pointer) // CHECK-NEXT: 2048 | int b -// CHECK-NEXT: 2056 | struct RA (virtual base) (empty) +// CHECK-NEXT: 2052 | struct RA (virtual base) (empty) // CHECK-NEXT: | [sizeof=2056, align=1024 // CHECK-NEXT: | nvsize=2052, nvalign=1024] // CHECK: *** Dumping AST Record Layout @@ -516,7 +516,7 @@ struct RE { // CHECK-X64-NEXT: 0 | struct RB2 // CHECK-X64-NEXT: 0 | (RB2 vbtable pointer) // CHECK-X64-NEXT: 1024 | int b -// CHECK-X64-NEXT: 1032 | struct RA (virtual base) (empty) +// CHECK-X64-NEXT: 1028 | struct RA (virtual base) (empty) // CHECK-X64-NEXT: | [sizeof=1032, align=1024 // CHECK-X64-NEXT: | nvsize=1028, nvalign=1024] // CHECK-X64: *** Dumping AST Record Layout @@ -524,7 +524,7 @@ struct RE { // CHECK-X64-NEXT: 0 | (RB3 vftable pointer) // CHECK-X64-NEXT: 1024 | (RB3 vbtable pointer) // CHECK-X64-NEXT: 2048 | int b -// CHECK-X64-NEXT: 2056 | struct RA (virtual base) (empty) +// CHECK-X64-NEXT: 2052 | struct RA (virtual base) (empty) // CHECK-X64-NEXT: | [sizeof=2056, align=1024 // CHECK-X64-NEXT: | nvsize=2052, nvalign=1024] // CHECK-X64: *** Dumping AST Record Layout -- cgit v1.2.3