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

Push ctor vtable construction down further. WIP. 

llvm-svn: 86878
This commit is contained in:
Mike Stump 2009-11-11 20:26:26 +00:00
parent 7cf8238291
commit eac4559790
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -681,10 +681,15 @@ int64_t CGVtableInfo::getVirtualBaseOffsetIndex(const CXXRecordDecl *RD,
return I->second;
}
llvm::Constant *CodeGenModule::GenerateVtable(const CXXRecordDecl *RD) {
llvm::Constant *CodeGenModule::GenerateVtable(const CXXRecordDecl *RD,
const CXXRecordDecl *LayoutClass,
uint64_t Offset) {
llvm::SmallString<256> OutName;
llvm::raw_svector_ostream Out(OutName);
mangleCXXVtable(getMangleContext(), RD, Out);
if (LayoutClass)
mangleCXXCtorVtable(getMangleContext(), RD, Offset, LayoutClass, Out);
else
mangleCXXVtable(getMangleContext(), RD, Out);
llvm::GlobalVariable::LinkageTypes linktype;
linktype = llvm::GlobalValue::LinkOnceODRLinkage;
@ -754,7 +759,7 @@ class VTTBuilder {
&& !NonVirtualPrimaryBase) {
// FIXME: Slightly too many of these for __ZTT8test8_B2
llvm::Constant *vtbl;
vtbl = CGM.getVtableInfo().getVtable(Base, Class, BaseOffset/8);
vtbl = CGM.getVtableInfo().getCtorVtable(Base, Class, BaseOffset/8);
Inits.push_back(vtbl);
}
Secondary(Base, BaseOffset, BaseMorallyVirtual);
@ -768,7 +773,7 @@ class VTTBuilder {
return;
// First comes the primary virtual table pointer...
Inits.push_back(CGM.getVtableInfo().getVtable(RD, Class, Offset));
Inits.push_back(CGM.getVtableInfo().getCtorVtable(RD, Class, Offset));
// then the secondary VTTs....
SecondaryVTTs(RD, MorallyVirtual);
@ -852,10 +857,7 @@ llvm::Constant *CodeGenModule::GenerateVTT(const CXXRecordDecl *RD) {
return vtt;
}
llvm::Constant *CGVtableInfo::getVtable(const CXXRecordDecl *RD,
const CXXRecordDecl *Class,
uint64_t Offset) {
// FIXME: Add ctor vtable support
llvm::Constant *CGVtableInfo::getVtable(const CXXRecordDecl *RD) {
llvm::Constant *&vtbl = Vtables[RD];
if (vtbl)
return vtbl;
@ -863,3 +865,9 @@ llvm::Constant *CGVtableInfo::getVtable(const CXXRecordDecl *RD,
CGM.GenerateVTT(RD);
return vtbl;
}
llvm::Constant *CGVtableInfo::getCtorVtable(const CXXRecordDecl *RD,
const CXXRecordDecl *Class,
uint64_t Offset) {
return CGM.GenerateVtable(RD, Class, Offset);
}

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

@ -57,8 +57,9 @@ public:
int64_t getVirtualBaseOffsetIndex(const CXXRecordDecl *RD,
const CXXRecordDecl *VBase);
llvm::Constant *getVtable(const CXXRecordDecl *RD,
const CXXRecordDecl *Class=0, uint64_t Offset=0);
llvm::Constant *getVtable(const CXXRecordDecl *RD);
llvm::Constant *getCtorVtable(const CXXRecordDecl *RD,
const CXXRecordDecl *Class, uint64_t Offset);
};
}

4
clang/lib/CodeGen/CodeGenModule.h
View File

@ -253,7 +253,9 @@ public:
const llvm::Type *Ty = 0);
/// GenerateVtable - Generate the vtable for the given type.
llvm::Constant *GenerateVtable(const CXXRecordDecl *RD);
llvm::Constant *GenerateVtable(const CXXRecordDecl *RD,
const CXXRecordDecl *Class=0,
uint64_t Offset=0);
/// GenerateVTT - Generate the VTT for the given type.
llvm::Constant *GenerateVTT(const CXXRecordDecl *RD);