commit a246468f5816242734ec7f8dcab846c5805d8e86
author David Majnemer <david.majnemer@gmail.com> Thu Jul 17 00:55:19 2014 +0000
committer David Majnemer <david.majnemer@gmail.com> Thu Jul 17 00:55:19 2014 +0000
tree 64c42b044f85f147a564cbd6bb2231814c50b59b
parent 286691ad5e1a8efdd1d98c56dccbacd6cc709b77

MS ABI: Padding injected between empty vbases doesn't up required align

Only alignment is changed, not required alignment.

llvm-svn: 213217

clang/lib/AST/RecordLayoutBuilder.cpp

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index b5ebbee..b3deeba 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -2615,7 +2615,7 @@
     if ((PreviousBaseLayout && PreviousBaseLayout->hasZeroSizedSubObject() &&
         BaseLayout.leadsWithZeroSizedBase()) || HasVtordisp) {
       Size = Size.RoundUpToAlignment(VtorDispAlignment) + VtorDispSize;
-      RequiredAlignment = VtorDispAlignment;
+      Alignment = std::max(VtorDispAlignment, Alignment);
     }
     // Insert the virtual base.
     ElementInfo Info = getAdjustedElementInfo(BaseLayout);