commit 7e41038723bf77132674f55b12f60e24e5473b33
author Anders Carlsson <andersca@mac.com> Sat Sep 26 01:09:35 2009 +0000
committer Anders Carlsson <andersca@mac.com> Sat Sep 26 01:09:35 2009 +0000
tree ee86b371082a148a0e4911553f862cd6cacdb7ce
parent 4f5bf3b095f3454eb0da2de9f44639f8fa9948fb

Use NextOffset when laying out a field.

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

lib/AST/RecordLayoutBuilder.cpp

diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp
index 4709070..d84b0d1 100644
--- a/lib/AST/RecordLayoutBuilder.cpp
+++ b/lib/AST/RecordLayoutBuilder.cpp
@@ -513,7 +513,7 @@
 
 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;
 

test/SemaCXX/empty-class-layout.cpp

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