summaryrefslogtreecommitdiffstats
path: root/clang/test/Layout/ms-x86-alias-avoidance-padding.cpp
diff options
context:
space:
mode:
authorWarren Hunt <whunt@google.com>2013-12-10 01:44:39 +0000
committerWarren Hunt <whunt@google.com>2013-12-10 01:44:39 +0000
commit1603e52700dc7ba0b264be03a8fe882457413dea (patch)
tree5cb8fbcd0ad86ffbce8f35a33ce8069c1cdf027c /clang/test/Layout/ms-x86-alias-avoidance-padding.cpp
parent78f534d689175a36810d9c37b40491c457724201 (diff)
downloadbcm5719-llvm-1603e52700dc7ba0b264be03a8fe882457413dea.tar.gz
bcm5719-llvm-1603e52700dc7ba0b264be03a8fe882457413dea.zip
[ms-abi] 64-bit fixes for r196549
In order to address latent bugs that were easier to expose in 64-bit mode, we move the application of __declspec(align) to before the layout of vbases rather than after. llvm-svn: 196861
Diffstat (limited to 'clang/test/Layout/ms-x86-alias-avoidance-padding.cpp')
-rw-r--r--clang/test/Layout/ms-x86-alias-avoidance-padding.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/test/Layout/ms-x86-alias-avoidance-padding.cpp b/clang/test/Layout/ms-x86-alias-avoidance-padding.cpp
index 86b3cebe241..78957cf747e 100644
--- a/clang/test/Layout/ms-x86-alias-avoidance-padding.cpp
+++ b/clang/test/Layout/ms-x86-alias-avoidance-padding.cpp
@@ -166,9 +166,9 @@ struct __declspec(align(1)) T3 : virtual T1, virtual T2 {
// CHECK-X64: 8 | struct T0 (base) (empty)
// CHECK-X64: 8 | struct AT (base) (empty)
// CHECK-X64: 8 | char a
-// CHECK-X64: 20 | struct T2 (virtual base)
-// CHECK-X64: 20 | struct AT (base) (empty)
-// CHECK-X64: 20 | char a
+// CHECK-X64: 16 | struct T2 (virtual base)
+// CHECK-X64: 16 | struct AT (base) (empty)
+// CHECK-X64: 16 | char a
// CHECK-X64: | [sizeof=24, align=8
// CHECK-X64: | nvsize=8, nvalign=8]
OpenPOWER on IntegriCloud