Revert r148056 while I investigate failures.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148068 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp
index 69e31a3..43dee10 100644
--- a/lib/AST/RecordLayoutBuilder.cpp
+++ b/lib/AST/RecordLayoutBuilder.cpp
@@ -1867,13 +1867,14 @@
Context.toBits(UnpackedFieldAlign), FieldPacked, D);
// Reserve space for this field.
+ uint64_t FieldSizeInBits = Context.toBits(FieldSize);
if (IsUnion)
- setDataSize(std::max(getDataSize(), FieldSize));
+ setSize(std::max(getSizeInBits(), FieldSizeInBits));
else
- setDataSize(FieldOffset + FieldSize);
+ setSize(FieldOffset + FieldSize);
- // Update the size.
- setSize(std::max(getSize(), getDataSize()));
+ // Update the data size.
+ setDataSize(getSizeInBits());
// Remember max struct/class alignment.
UpdateAlignment(FieldAlign, UnpackedFieldAlign);