From a862d95054ec99de14b31b320924157066994114 Mon Sep 17 00:00:00 2001 From: Ken Dyck Date: Sat, 12 Mar 2011 12:03:11 +0000 Subject: Use CharUnits for argument passed to AppendPadding() from AppendBitField(). No change in functionality intended. llvm-svn: 127538 --- clang/lib/CodeGen/CGExprConstant.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'clang/lib/CodeGen/CGExprConstant.cpp') diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp index 01af80c84d9..0975d256ba7 100644 --- a/clang/lib/CodeGen/CGExprConstant.cpp +++ b/clang/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(); -- cgit v1.2.3