From: Ken Dyck Date: Thu, 10 Feb 2011 12:36:29 +0000 (+0000) Subject: Drop the 'InBits' part from the name of RecordSizeInBits as the value is in X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9186ff310cf0ad92ec7f39b2c9dcb7e848195052;p=clang Drop the 'InBits' part from the name of RecordSizeInBits as the value is in character units. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@125281 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index 36673764b9..af0c9ed499 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -490,9 +490,9 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { } // Append tail padding. - uint64_t RecordSizeInBits = Layout.getSize().getQuantity(); - if (RecordSizeInBits > Size) - AppendPadding(Layout.getSize().getQuantity(), Align); + uint64_t RecordSize = Layout.getSize().getQuantity(); + if (RecordSize > Size) + AppendPadding(RecordSize, Align); } void CGRecordLayoutBuilder::LayoutBase(const CXXRecordDecl *BaseDecl, @@ -626,8 +626,8 @@ CGRecordLayoutBuilder::ComputeNonVirtualBaseType(const CXXRecordDecl *RD) { // First check if we can use the same fields as for the complete class. - uint64_t RecordSizeInBits = Layout.getSize().getQuantity(); - if (AlignedNonVirtualTypeSize == RecordSizeInBits) { + uint64_t RecordSize = Layout.getSize().getQuantity(); + if (AlignedNonVirtualTypeSize == RecordSize) { NonVirtualBaseTypeIsSameAsCompleteType = true; return true; }