diff options
| author | Ken Dyck <kd@kendyck.com> | 2011-03-31 00:48:04 +0000 |
|---|---|---|
| committer | Ken Dyck <kd@kendyck.com> | 2011-03-31 00:48:04 +0000 |
| commit | 1a93b3b080474ab9b62ba63b07a890f559ca27a3 (patch) | |
| tree | 15e77f1f3ab4db41c7661f36409d395eb3e63353 /clang/lib | |
| parent | 73906b05ca8e45aec4a7fb8e0300995d73d5ce1f (diff) | |
| download | llvm-1a93b3b080474ab9b62ba63b07a890f559ca27a3.zip llvm-1a93b3b080474ab9b62ba63b07a890f559ca27a3.tar.gz llvm-1a93b3b080474ab9b62ba63b07a890f559ca27a3.tar.bz2 | |
Convert the OffsetInLayoutClass of the VCallAndVBaseOffsetBuilder
constructor to CharUnits. No change in functionality intended.
llvm-svn: 128598
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/CGVTables.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp index 80fff76..db4b689 100644 --- a/clang/lib/CodeGen/CGVTables.cpp +++ b/clang/lib/CodeGen/CGVTables.cpp @@ -760,13 +760,12 @@ public: const CXXRecordDecl *LayoutClass, const FinalOverriders *Overriders, BaseSubobject Base, bool BaseIsVirtual, - uint64_t OffsetInLayoutClass) + CharUnits OffsetInLayoutClass) : MostDerivedClass(MostDerivedClass), LayoutClass(LayoutClass), Context(MostDerivedClass->getASTContext()), Overriders(Overriders) { // Add vcall and vbase offsets. - AddVCallAndVBaseOffsets(Base, BaseIsVirtual, - Context.toCharUnitsFromBits(OffsetInLayoutClass)); + AddVCallAndVBaseOffsets(Base, BaseIsVirtual, OffsetInLayoutClass); } /// Methods for iterating over the components. @@ -1434,7 +1433,8 @@ VTableBuilder::ComputeThisAdjustment(const CXXMethodDecl *MD, BaseSubobject(Offset.VirtualBase, CharUnits::Zero()), /*BaseIsVirtual=*/true, - /*OffsetInLayoutClass=*/0); + /*OffsetInLayoutClass=*/ + CharUnits::Zero()); VCallOffsets = Builder.getVCallOffsets(); } @@ -1751,7 +1751,7 @@ VTableBuilder::LayoutPrimaryAndSecondaryVTables(BaseSubobject Base, // Add vcall and vbase offsets for this vtable. VCallAndVBaseOffsetBuilder Builder(MostDerivedClass, LayoutClass, &Overriders, Base, BaseIsVirtualInLayoutClass, - Context.toBits(OffsetInLayoutClass)); + OffsetInLayoutClass); Components.append(Builder.components_begin(), Builder.components_end()); // Check if we need to add these vcall offsets. @@ -2434,7 +2434,7 @@ int64_t CodeGenVTables::getVirtualBaseOffsetOffset(const CXXRecordDecl *RD, VCallAndVBaseOffsetBuilder Builder(RD, RD, /*FinalOverriders=*/0, BaseSubobject(RD, CharUnits::Zero()), /*BaseIsVirtual=*/false, - /*OffsetInLayoutClass=*/0); + /*OffsetInLayoutClass=*/CharUnits::Zero()); for (VCallAndVBaseOffsetBuilder::VBaseOffsetOffsetsMapTy::const_iterator I = Builder.getVBaseOffsetOffsets().begin(), |