diff options
| author | Ken Dyck <kd@kendyck.com> | 2011-03-12 12:03:11 +0000 |
|---|---|---|
| committer | Ken Dyck <kd@kendyck.com> | 2011-03-12 12:03:11 +0000 |
| commit | f004da49eae567b15240029cdd96617958c6b0c9 (patch) | |
| tree | 0fa5e695348d1fbee5d6b116287fe9557a43d57a /lib/CodeGen/CGExprConstant.cpp | |
| parent | 60618fa7f88d5162bb5b40988b6b38d4d75d6fc6 (diff) | |
Use CharUnits for argument passed to AppendPadding() from AppendBitField().
No change in functionality intended.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127538 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprConstant.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprConstant.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index 01af80c84d..0975d256ba 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -124,17 +124,18 @@ AppendField(const FieldDecl *Field, uint64_t FieldOffset, void ConstStructBuilder::AppendBitField(const FieldDecl *Field, uint64_t FieldOffset, llvm::ConstantInt *CI) { + const ASTContext &Context = CGM.getContext(); if (FieldOffset > NextFieldOffsetInBytes * 8) { // We need to add padding. - uint64_t NumBytes = - llvm::RoundUpToAlignment(FieldOffset - - NextFieldOffsetInBytes * 8, 8) / 8; + CharUnits PadSize = Context.toCharUnitsFromBits( + llvm::RoundUpToAlignment(FieldOffset - NextFieldOffsetInBytes * 8, + Context.Target.getCharAlign())); - AppendPadding(CharUnits::fromQuantity(NumBytes)); + AppendPadding(PadSize); } uint64_t FieldSize = - Field->getBitWidth()->EvaluateAsInt(CGM.getContext()).getZExtValue(); + Field->getBitWidth()->EvaluateAsInt(Context).getZExtValue(); llvm::APInt FieldValue = CI->getValue(); |