1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 4528fc0a96..74051383f1 100644
--- a/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -208,7 +208,7 @@ bool CGRecordLayoutBuilder::LayoutFields(const RecordDecl *D) {
 
   // Append tail padding if necessary.
   if (Layout.getSize() / 8 > getNextFieldOffsetInBytes())
-    AppendPadding(Layout.getSize() / 8, AlignmentAsLLVMStruct);
+    AppendPadding(getNextFieldOffsetInBytes(), AlignmentAsLLVMStruct);
   
   return true;
 }
@@ -290,7 +290,7 @@ CGRecordLayoutBuilder::ComputeLayout(CodeGenTypes &Types,
   CGRecordLayoutBuilder Builder(Types);
   
   Builder.Layout(D);
-  
+
   // FIXME: Once this works well enough, enable it.
   return 0;