diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2012-01-12 23:27:03 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2012-01-12 23:27:03 +0000 |
| commit | 43f1834fad7fb2847b0faef2a5cd7f6489844218 (patch) | |
| tree | 98f92236486035eeb880c2c596b71eeaab819c4f /clang/lib | |
| parent | 9bcb72136e05c13f58c5df7f78998a9bf8a75d12 (diff) | |
| download | bcm5719-llvm-43f1834fad7fb2847b0faef2a5cd7f6489844218.tar.gz bcm5719-llvm-43f1834fad7fb2847b0faef2a5cd7f6489844218.zip | |
Revert r148056 while I investigate failures.
llvm-svn: 148068
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/RecordLayoutBuilder.cpp | 9 |
1 files changed, 5 insertions, 4 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); |
