From: Ken Dyck <kd@kendyck.com>
Date: Thu, 10 Mar 2011 01:53:59 +0000 (+0000)
Subject: Round up the non-virtual size to the next char instead of rounding down.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90ce2dba294b8443169fe1a583914908fae0e767;p=clang

Round up the non-virtual size to the next char instead of rounding down.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127390 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp
index 3bdb677975..ecaa1f6962 100644
--- a/lib/AST/RecordLayoutBuilder.cpp
+++ b/lib/AST/RecordLayoutBuilder.cpp
@@ -1183,8 +1183,9 @@ void RecordLayoutBuilder::Layout(const CXXRecordDecl *RD) {
 
   LayoutFields(RD);
 
-  // FIXME: Size isn't always an exact multiple of the char width. Round up?
-  NonVirtualSize = Context.toCharUnitsFromBits(getSizeInBits());
+  NonVirtualSize = Context.toCharUnitsFromBits(
+        llvm::RoundUpToAlignment(getSizeInBits(), 
+                                 Context.Target.getCharAlign()));
   NonVirtualAlignment = Alignment;
 
   // Lay out the virtual bases and add the primary virtual base offsets.