Fixing assertion failure introduced in 196602.

Also includes a minor refactor with no functional change.

llvm-svn: 196627

1 files changed, 4 insertions, 6 deletions

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index b692025aa0f..a3ea6b9f386 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -2590,15 +2590,13 @@ void MicrosoftRecordLayoutBuilder::layoutVirtualBase(const CXXRecordDecl *RD,
   // vtordisps are always 4 bytes (even in 64-bit mode)
   if (HasVtordisp)
     Size = Size.RoundUpToAlignment(Alignment) + CharUnits::fromQuantity(4);
-  Size = Size.RoundUpToAlignment(BaseAlign);
 
   // Insert the base here.
-  CharUnits BaseOffset = Size.RoundUpToAlignment(BaseAlign);
+  Size = Size.RoundUpToAlignment(BaseAlign);
   VBases.insert(
-      std::make_pair(RD, ASTRecordLayout::VBaseInfo(BaseOffset, HasVtordisp)));
-  Size = BaseOffset + BaseNVSize;
-  // Note: we don't update alignment here because it was accounted for in
-  // InitializeLayout.
+      std::make_pair(RD, ASTRecordLayout::VBaseInfo(Size, HasVtordisp)));
+  Size += BaseNVSize;
+  // Alignment was upadated in InitializeCXXLayout.
 
   PreviousBaseLayout = &Layout;
 }