maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Replace calls to AppendBytes with calls to AppendPadding when the bytes appended are padding. 

llvm-svn: 120922
This commit is contained in:
Anders Carlsson 2010-12-04 23:53:18 +00:00
parent 8867390cf2
commit d74cad80b0
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/clang.xcodeproj/project.pbxproj
View File

@ -2063,6 +2063,7 @@
isa = PBXProject;
buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "clang" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,

17
clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
View File

@ -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,