Use NextOffset when laying out a field.

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

diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp
index 470907012b2ae24d73e3d6a6284af75fadb0d078..d84b0d13003401cca35f82e71324d6c3c2fd5f0e 100644 (file)
--- a/lib/AST/RecordLayoutBuilder.cpp
+++ b/lib/AST/RecordLayoutBuilder.cpp
@@ -513,7 +513,7 @@ void ASTRecordLayoutBuilder::LayoutFields(const RecordDecl *D) {
 
 void ASTRecordLayoutBuilder::LayoutField(const FieldDecl *D) {
   bool FieldPacked = Packed;
-  uint64_t FieldOffset = IsUnion ? 0 : Size;
+  uint64_t FieldOffset = IsUnion ? 0 : NextOffset;
   uint64_t FieldSize;
   unsigned FieldAlign;
 

diff --git a/test/SemaCXX/empty-class-layout.cpp b/test/SemaCXX/empty-class-layout.cpp
index ce6506553d78b4b0ab353e03be03520a2cf49805..e4e62aa36915c835e78159da8ec7ec830eb55417 100644 (file)
--- a/test/SemaCXX/empty-class-layout.cpp
+++ b/test/SemaCXX/empty-class-layout.cpp
@@ -57,3 +57,8 @@ SA(9, sizeof(S5) == 2);
 
 struct S6 : S5 { };
 SA(10, sizeof(S6) == 2);
+
+struct S7 : Empty {
+  void *v;
+};
+SA(11, sizeof(S7) == 8);