replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert the RecordSize parameter of AppendTailPadding() to CharUnits to 

avoid converting to bits and back again. No change in functionality
intended.

llvm-svn: 127455
This commit is contained in:
Ken Dyck 2011-03-11 02:17:05 +00:00
parent dbc0191181
commit 327b77a442
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/CodeGen/CGExprConstant.cpp
View File

@ -58,7 +58,7 @@ private:
void AppendPadding(uint64_t NumBytes);
void AppendTailPadding(uint64_t RecordSize);
void AppendTailPadding(CharUnits RecordSize);
void ConvertStructToPacked();
@ -280,13 +280,11 @@ void ConstStructBuilder::AppendPadding(uint64_t NumBytes) {
NextFieldOffsetInBytes += getSizeInBytes(C);
}
void ConstStructBuilder::AppendTailPadding(uint64_t RecordSize) {
assert(RecordSize % 8 == 0 && "Invalid record size!");
void ConstStructBuilder::AppendTailPadding(CharUnits RecordSize) {
assert(NextFieldOffsetInBytes <= RecordSize.getQuantity() &&
"Size mismatch!");
uint64_t RecordSizeInBytes = RecordSize / 8;
assert(NextFieldOffsetInBytes <= RecordSizeInBytes && "Size mismatch!");
unsigned NumPadBytes = RecordSizeInBytes - NextFieldOffsetInBytes;
unsigned NumPadBytes = RecordSize.getQuantity() - NextFieldOffsetInBytes;
AppendPadding(NumPadBytes);
}
@ -394,7 +392,7 @@ bool ConstStructBuilder::Build(InitListExpr *ILE) {
}
// Append tail padding if necessary.
AppendTailPadding(CGM.getContext().toBits(Layout.getSize()));
AppendTailPadding(Layout.getSize());
assert(Layout.getSize().getQuantity() == NextFieldOffsetInBytes &&
"Tail padding mismatch!");