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

Introduce a CharUnits FieldOffsetInChars variable in AppendField() to 

replace some uses of FieldOffsetInBytes. The remaining uses of
FieldOffsetInBytes will be replaced once NextFieldOffsetInBytes is converted
to CharUnits. No change in functionality intended.

llvm-svn: 127641
This commit is contained in:
Ken Dyck 2011-03-15 01:09:02 +00:00
parent 5c25a92011
commit 1c80fd1346
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,11 @@ private:
bool ConstStructBuilder::
AppendField(const FieldDecl *Field, uint64_t FieldOffset,
llvm::Constant *InitCst) {
uint64_t FieldOffsetInBytes = FieldOffset / 8;
const ASTContext &Context = CGM.getContext();
CharUnits FieldOffsetInChars = Context.toCharUnitsFromBits(FieldOffset);
uint64_t FieldOffsetInBytes = FieldOffsetInChars.getQuantity();
assert(NextFieldOffsetInBytes <= FieldOffsetInBytes
&& "Field offset mismatch!");
@ -100,9 +104,9 @@ AppendField(const FieldDecl *Field, uint64_t FieldOffset,
if (AlignedNextFieldOffsetInBytes < FieldOffsetInBytes) {
// We need to append padding.
AppendPadding(
CharUnits::fromQuantity(FieldOffsetInBytes - NextFieldOffsetInBytes));
FieldOffsetInChars - CharUnits::fromQuantity(NextFieldOffsetInBytes));
assert(NextFieldOffsetInBytes == FieldOffsetInBytes &&
assert(NextFieldOffsetInBytes == FieldOffsetInChars.getQuantity() &&
"Did not add enough padding!");
AlignedNextFieldOffsetInBytes = NextFieldOffsetInBytes;