Eliminate a divide-by-8 in BuildVMIClassTypeInfo() by using CharUnits for
the base offset. No change in functionality intended.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@129179 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp
index fb89f4c..b8d234f 100644
--- a/lib/CodeGen/CGRTTI.cpp
+++ b/lib/CodeGen/CGRTTI.cpp
@@ -877,15 +877,16 @@
// For a non-virtual base, this is the offset in the object of the base
// subobject. For a virtual base, this is the offset in the virtual table of
// the virtual base offset for the virtual base referenced (negative).
+ CharUnits Offset;
if (Base->isVirtual())
- OffsetFlags =
- CGM.getVTables().getVirtualBaseOffsetOffset(RD, BaseDecl).getQuantity();
+ Offset =
+ CGM.getVTables().getVirtualBaseOffsetOffset(RD, BaseDecl);
else {
const ASTRecordLayout &Layout = CGM.getContext().getASTRecordLayout(RD);
- OffsetFlags = Layout.getBaseClassOffsetInBits(BaseDecl) / 8;
+ Offset = Layout.getBaseClassOffset(BaseDecl);
};
- OffsetFlags <<= 8;
+ OffsetFlags = Offset.getQuantity() << 8;
// The low-order byte of __offset_flags contains flags, as given by the
// masks from the enumeration __offset_flags_masks.