OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Simplify the vcall offset calculation and make it give the correct answers :) My test case now has the right values but in the wrong order. 

llvm-svn: 96877
This commit is contained in:
Anders Carlsson 2010-02-23 03:14:49 +00:00
parent 49fd94d261
commit 510d22d097
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
clang/lib/CodeGen/CGVtable.cpp
View File

@ -967,7 +967,7 @@ private:
VisitedVirtualBasesSetTy &VBases); VisitedVirtualBasesSetTy &VBases);
/// AddVCallOffsets - Add vcall offsets for the given base subobject. /// AddVCallOffsets - Add vcall offsets for the given base subobject.
void AddVCallOffsets(BaseSubobject Base); void AddVCallOffsets(BaseSubobject Base, uint64_t VBaseOffset);
/// AddVBaseOffsets - Add vbase offsets for the given class. /// AddVBaseOffsets - Add vbase offsets for the given class.
void AddVBaseOffsets(const CXXRecordDecl *Base, int64_t OffsetToTop, void AddVBaseOffsets(const CXXRecordDecl *Base, int64_t OffsetToTop,
@ -1108,10 +1108,13 @@ VtableBuilder::AddVCallAndVBaseOffsets(BaseSubobject Base,
// We only want to add vcall offsets for virtual bases. // We only want to add vcall offsets for virtual bases.
if (BaseIsVirtual && OffsetToTop != 0) if (BaseIsVirtual && OffsetToTop != 0)
AddVCallOffsets(Base); AddVCallOffsets(Base, Base.getBaseOffset());
} }
void VtableBuilder::AddVCallOffsets(BaseSubobject Base) { void VtableBuilder::AddVCallOffsets(BaseSubobject Base, uint64_t VBaseOffset) {
printf("adding call offsets for (%s, %llu) vbase offset %llu\n",
Base.getBase()->getQualifiedNameAsString().c_str(),
Base.getBaseOffset(), VBaseOffset);
const CXXRecordDecl *RD = Base.getBase(); const CXXRecordDecl *RD = Base.getBase();
const ASTRecordLayout &Layout = Context.getASTRecordLayout(RD); const ASTRecordLayout &Layout = Context.getASTRecordLayout(RD);
@ -1122,7 +1125,8 @@ void VtableBuilder::AddVCallOffsets(BaseSubobject Base) {
uint64_t PrimaryBaseOffset = Base.getBaseOffset() + uint64_t PrimaryBaseOffset = Base.getBaseOffset() +
Layout.getBaseClassOffset(PrimaryBase); Layout.getBaseClassOffset(PrimaryBase);
AddVCallOffsets(BaseSubobject(PrimaryBase, PrimaryBaseOffset)); AddVCallOffsets(BaseSubobject(PrimaryBase, PrimaryBaseOffset),
VBaseOffset);
} }
// Add the vcall offsets. // Add the vcall offsets.
@ -1147,28 +1151,15 @@ void VtableBuilder::AddVCallOffsets(BaseSubobject Base) {
// signature. // signature.
if (!VCallOffsets.AddVCallOffset(MD, OffsetOffset)) if (!VCallOffsets.AddVCallOffset(MD, OffsetOffset))
continue; continue;
// Get the 'this' pointer adjustment offset.
BaseOffset ThisAdjustmentOffset =
Overriders.getThisAdjustmentOffset(Base, MD);
int64_t Offset = 0;
if (const CXXRecordDecl *VBaseDecl = ThisAdjustmentOffset.VirtualBase) {
const ASTRecordLayout &MostDerivedClassLayout =
Context.getASTRecordLayout(MostDerivedClass);
FinalOverriders::OverriderInfo Overrider =
Overriders.getOverrider(Base, MD);
Offset = // Get the final overrider.
-(int64_t)MostDerivedClassLayout.getVBaseClassOffset(VBaseDecl); FinalOverriders::OverriderInfo Overrider =
Overriders.getOverrider(Base, MD);
// The base offset should be relative to the final overrider.
Offset += Overrider.BaseOffset; /// The vcall offset is the offset from the virtual base to the object where
/// the function was overridden.
// FIXME: We should not use / 8 here. // FIXME: We should not use / 8 here.
Offset = Offset / 8; int64_t Offset = (int64_t)(Overrider.BaseOffset - VBaseOffset) / 8;
}
VCallAndVBaseOffsets.push_back(VtableComponent::MakeVCallOffset(Offset)); VCallAndVBaseOffsets.push_back(VtableComponent::MakeVCallOffset(Offset));
} }
@ -1187,7 +1178,7 @@ void VtableBuilder::AddVCallOffsets(BaseSubobject Base) {
uint64_t BaseOffset = Base.getBaseOffset() + uint64_t BaseOffset = Base.getBaseOffset() +
Layout.getBaseClassOffset(BaseDecl); Layout.getBaseClassOffset(BaseDecl);
AddVCallOffsets(BaseSubobject(BaseDecl, BaseOffset)); AddVCallOffsets(BaseSubobject(BaseDecl, BaseOffset), VBaseOffset);
} }
} }