diff options
| -rw-r--r-- | clang/clang.xcodeproj/project.pbxproj | 1 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 17 |
2 files changed, 7 insertions, 11 deletions
diff --git a/clang/clang.xcodeproj/project.pbxproj b/clang/clang.xcodeproj/project.pbxproj index 36660f04aa4..877d81e61e1 100644 --- a/clang/clang.xcodeproj/project.pbxproj +++ b/clang/clang.xcodeproj/project.pbxproj @@ -2063,6 +2063,7 @@ isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( English, diff --git a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp index 9b154d03bf6..855552f960c 100644 --- a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -136,7 +136,8 @@ private: /// AppendPadding - Appends enough padding bytes so that the total /// struct size is a multiple of the field alignment. - void AppendPadding(uint64_t FieldOffsetInBytes, unsigned FieldAlignment); + void AppendPadding(uint64_t FieldOffsetInBytes, + unsigned FieldAlignmentInBytes); /// getByteArrayType - Returns a byte array type with the given number of /// elements. @@ -325,7 +326,7 @@ void CGRecordLayoutBuilder::LayoutBitField(const FieldDecl *D, assert(FieldOffset % 8 == 0 && "Field offset not aligned correctly"); // Append padding if necessary. - AppendBytes((FieldOffset - NextFieldOffset) / 8); + AppendPadding(FieldOffset / 8, 1); NumBytesToAppend = llvm::RoundUpToAlignment(FieldSize, 8) / 8; @@ -393,13 +394,7 @@ bool CGRecordLayoutBuilder::LayoutField(const FieldDecl *D, return false; } - if (AlignedNextFieldOffsetInBytes < FieldOffsetInBytes) { - // Even with alignment, the field offset is not at the right place, - // insert padding. - uint64_t PaddingInBytes = FieldOffsetInBytes - NextFieldOffsetInBytes; - - AppendBytes(PaddingInBytes); - } + AppendPadding(FieldOffsetInBytes, TypeAlignment); // Now append the field. LLVMFields.push_back(LLVMFieldInfo(D, FieldTypes.size())); @@ -713,13 +708,13 @@ void CGRecordLayoutBuilder::AppendField(uint64_t FieldOffsetInBytes, } void CGRecordLayoutBuilder::AppendPadding(uint64_t FieldOffsetInBytes, - unsigned FieldAlignment) { + unsigned FieldAlignmentInBytes) { assert(NextFieldOffsetInBytes <= FieldOffsetInBytes && "Incorrect field layout!"); // Round up the field offset to the alignment of the field type. uint64_t AlignedNextFieldOffsetInBytes = - llvm::RoundUpToAlignment(NextFieldOffsetInBytes, FieldAlignment); + llvm::RoundUpToAlignment(NextFieldOffsetInBytes, FieldAlignmentInBytes); if (AlignedNextFieldOffsetInBytes < FieldOffsetInBytes) { // Even with alignment, the field offset is not at the right place, |
