From 9123284640b33e902c23aac15cb7f547ca1ff71f Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Sun, 11 Apr 2010 22:03:57 +0000 Subject: [PATCH] Rename a function parameter. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@100990 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGVTables.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/CodeGen/CGVTables.cpp b/lib/CodeGen/CGVTables.cpp index 0d9c3ad4ae..210b0e50ba 100644 --- a/lib/CodeGen/CGVTables.cpp +++ b/lib/CodeGen/CGVTables.cpp @@ -1246,8 +1246,11 @@ private: /// LayoutPrimaryAndSecondaryVtables - Layout the primary vtable for the /// given base subobject, as well as all its secondary vtables. + /// + /// \param BaseIsVirtualInLayoutClass - Whether the base subobject is virtual + /// in the layout class. void LayoutPrimaryAndSecondaryVtables(BaseSubobject Base, - bool BaseIsVirtual, + bool BaseIsVirtualInLayoutClass, uint64_t OffsetInLayoutClass); /// LayoutSecondaryVtables - Layout the secondary vtables for the given base @@ -1851,17 +1854,18 @@ void VTableBuilder::LayoutVtable() { void VTableBuilder::LayoutPrimaryAndSecondaryVtables(BaseSubobject Base, - bool BaseIsVirtual, + bool BaseIsVirtualInLayoutClass, uint64_t OffsetInLayoutClass) { assert(Base.getBase()->isDynamicClass() && "class does not have a vtable!"); // Add vcall and vbase offsets for this vtable. VCallAndVBaseOffsetBuilder Builder(MostDerivedClass, LayoutClass, &Overriders, - Base, BaseIsVirtual, OffsetInLayoutClass); + Base, BaseIsVirtualInLayoutClass, + OffsetInLayoutClass); Components.append(Builder.components_begin(), Builder.components_end()); // Check if we need to add these vcall offsets. - if (BaseIsVirtual && !Builder.getVCallOffsets().empty()) { + if (BaseIsVirtualInLayoutClass && !Builder.getVCallOffsets().empty()) { VCallOffsetMap &VCallOffsets = VCallOffsetsForVBases[Base.getBase()]; if (VCallOffsets.empty()) @@ -1920,7 +1924,7 @@ VTableBuilder::LayoutPrimaryAndSecondaryVtables(BaseSubobject Base, RD = PrimaryBase; } - bool BaseIsMorallyVirtual = BaseIsVirtual; + bool BaseIsMorallyVirtual = BaseIsVirtualInLayoutClass; if (isBuildingConstructorVtable() && Base.getBase() == MostDerivedClass) BaseIsMorallyVirtual = false; @@ -1979,7 +1983,7 @@ void VTableBuilder::LayoutSecondaryVtables(BaseSubobject Base, // Layout the primary vtable (and any secondary vtables) for this base. LayoutPrimaryAndSecondaryVtables(BaseSubobject(BaseDecl, BaseOffset), - /*BaseIsVirtual=*/false, + /*BaseIsVirtualInLayoutClass=*/false, BaseOffsetInLayoutClass); } } -- 2.40.0