diff options
| author | Ken Dyck <kd@kendyck.com> | 2011-03-27 19:03:44 +0000 |
|---|---|---|
| committer | Ken Dyck <kd@kendyck.com> | 2011-03-27 19:03:44 +0000 |
| commit | f736d9cb75f45f402d9397a097214e32be61fc4c (patch) | |
| tree | b3c5fd5357a65e4b76d258e1b8791f33f9e42dcf /clang/lib/CodeGen/CGVTables.cpp | |
| parent | 7d876f3649fb735581ddb2483d89e895a23c3900 (diff) | |
| download | llvm-f736d9cb75f45f402d9397a097214e32be61fc4c.zip llvm-f736d9cb75f45f402d9397a097214e32be61fc4c.tar.gz llvm-f736d9cb75f45f402d9397a097214e32be61fc4c.tar.bz2 | |
Convert the BaseOffsetInLayoutClass parameter of ComputeThisAdjustment() to
CharUnits. No change in functionality intended.
llvm-svn: 128384
Diffstat (limited to 'clang/lib/CodeGen/CGVTables.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGVTables.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp index 0e7a477..b25772f 100644 --- a/clang/lib/CodeGen/CGVTables.cpp +++ b/clang/lib/CodeGen/CGVTables.cpp @@ -1073,7 +1073,7 @@ private: /// final overrider. ThisAdjustment ComputeThisAdjustment(const CXXMethodDecl *MD, - uint64_t BaseOffsetInLayoutClass, + CharUnits BaseOffsetInLayoutClass, FinalOverriders::OverriderInfo Overrider); /// AddMethod - Add a single virtual member function to the vtable @@ -1276,8 +1276,7 @@ void VTableBuilder::ComputeThisAdjustments() { } ThisAdjustment ThisAdjustment = - ComputeThisAdjustment(MD, - Context.toBits(MethodInfo.BaseOffsetInLayoutClass), Overrider); + ComputeThisAdjustment(MD, MethodInfo.BaseOffsetInLayoutClass, Overrider); if (ThisAdjustment.isEmpty()) continue; @@ -1401,15 +1400,14 @@ VTableBuilder::ComputeThisAdjustmentBaseOffset(BaseSubobject Base, ThisAdjustment VTableBuilder::ComputeThisAdjustment(const CXXMethodDecl *MD, - uint64_t BaseOffsetInLayoutClass, + CharUnits BaseOffsetInLayoutClass, FinalOverriders::OverriderInfo Overrider) { // Ignore adjustments for pure virtual member functions. if (Overrider.Method->isPure()) return ThisAdjustment(); - BaseSubobject OverriddenBaseSubobject(MD->getParent(), - Context.toCharUnitsFromBits( - BaseOffsetInLayoutClass)); + BaseSubobject OverriddenBaseSubobject(MD->getParent(), + BaseOffsetInLayoutClass); BaseSubobject OverriderBaseSubobject(Overrider.Method->getParent(), Overrider.Offset); @@ -1669,8 +1667,9 @@ VTableBuilder::AddMethods(BaseSubobject Base, uint64_t BaseOffsetInLayoutClass, if (!isBuildingConstructorVTable() && OverriddenMD != MD) { // Compute the this adjustment. ThisAdjustment ThisAdjustment = - ComputeThisAdjustment(OverriddenMD, BaseOffsetInLayoutClass, - Overrider); + ComputeThisAdjustment(OverriddenMD, + Context.toCharUnitsFromBits(BaseOffsetInLayoutClass), + Overrider); if (ThisAdjustment.VCallOffsetOffset && Overrider.Method->getParent() == MostDerivedClass) { |