Revert r148056 while I investigate failures.

llvm-svn: 148068

2 files changed, 5 insertions, 15 deletions

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index 69e31a30726..43dee104ba3 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -1867,13 +1867,14 @@ void RecordLayoutBuilder::LayoutField(const FieldDecl *D) {
                     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);
diff --git a/clang/test/SemaCXX/empty-class-layout.cpp b/clang/test/SemaCXX/empty-class-layout.cpp
index c68f2bb6fb0..0b46bf045ac 100644
--- a/clang/test/SemaCXX/empty-class-layout.cpp
+++ b/clang/test/SemaCXX/empty-class-layout.cpp
@@ -144,14 +144,3 @@ struct B : Empty, A { };
 SA(0, sizeof(B) == 16);
 
 }
-
-namespace Test7 {
-  // Make sure we reserve enough space for both bases; PR11745.
-  struct Empty { };
-  struct Base1 : Empty { };
-  struct Base2 : Empty { };
-  struct Test : Base1, Base2 {
-    char c;
-  };
-  SA(0, sizeof(Test) == 2);
-}