replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refine handling for non-virtual bases in return value adjustments for 

covariant thunks.  WIP.

llvm-svn: 84046
This commit is contained in:
Mike Stump 2009-10-13 22:54:56 +00:00
parent e4f4b5e919
commit 284312176a
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,22 +83,30 @@ public:
void GenerateVBaseOffsets(std::vector<llvm::Constant *> &offsets,
const CXXRecordDecl *RD, uint64_t Offset,
bool updateVBIndex) {
bool updateVBIndex, Index_t current_vbindex) {
for (CXXRecordDecl::base_class_const_iterator i = RD->bases_begin(),
e = RD->bases_end(); i != e; ++i) {
const CXXRecordDecl *Base =
cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
Index_t next_vbindex = current_vbindex;
if (i->isVirtual() && !SeenVBase.count(Base)) {
SeenVBase.insert(Base);
int64_t BaseOffset = -(Offset/8) + BLayout.getVBaseClassOffset(Base)/8;
llvm::Constant *m = wrap(BaseOffset);
m = wrap((0?700:0) + BaseOffset);
if (updateVBIndex)
VBIndex[Base] = (ssize_t)(-(offsets.size()*LLVMPointerWidth/8)
- 3*LLVMPointerWidth/8);
if (updateVBIndex) {
next_vbindex = (ssize_t)(-(offsets.size()*LLVMPointerWidth/8)
- 3*LLVMPointerWidth/8);
VBIndex[Base] = next_vbindex;
}
offsets.push_back(m);
}
GenerateVBaseOffsets(offsets, Base, Offset, updateVBIndex);
// We also record offsets for non-virtual bases to closest enclosing
// virtual base. We do this so that we don't have to search
// for the nearst virtual base class when generating thunks.
if (updateVBIndex && VBIndex.count(Base) == 0)
VBIndex[Base] = next_vbindex;
GenerateVBaseOffsets(offsets, Base, Offset, updateVBIndex, next_vbindex);
}
}
@ -122,7 +130,7 @@ public:
if (i != VBIndex.end())
return i->second;
assert(false && "FIXME: Locate the containing virtual base first");
assert(false && "FIXME: Base not found");
return 0;
}
@ -188,13 +196,19 @@ public:
Thunks[MD] = ThisOffset;
return true;
}
#if 0
// FIXME: finish off
int64_t O = VCallOffset[OMD] - Offset/8;
if (O) {
Thunks[MD] = std::make_pair(O, 0);
if (O || ReturnOffset.first || ReturnOffset.second) {
CallOffset ThisOffset = std::make_pair(O, 0);
if (ReturnOffset.first || ReturnOffset.second)
CovariantThunks[MD] = std::make_pair(std::make_pair(ThisOffset,
ReturnOffset),
oret);
else
Thunks[MD] = ThisOffset;
}
#endif
return true;
}
}
@ -394,7 +408,7 @@ public:
std::vector<llvm::Constant *> offsets;
extra = 0;
GenerateVBaseOffsets(offsets, RD, Offset, !ForVirtualBase);
GenerateVBaseOffsets(offsets, RD, Offset, !ForVirtualBase, 0);
if (ForVirtualBase)
extra = offsets.size();

8
clang/lib/CodeGen/CGVtable.h
View File

@ -47,9 +47,11 @@ public:
/// stored.
int64_t getMethodVtableIndex(const CXXMethodDecl *MD);
/// getVirtualBaseOffsetIndex - Return the index (relative to the vtable address
/// point) where the offset of the given virtual base of the given class is
// stored.
/// getVirtualBaseOffsetIndex - Return the index (relative to the vtable
/// address point) where the offset of the virtual base that contains the
/// given Base is stored, otherwise, if no virtual base contains the given
/// class, return 0. Base must be a virtual base class or an unambigious
/// base.
int64_t getVirtualBaseOffsetIndex(const CXXRecordDecl *RD,
const CXXRecordDecl *VBase);
};