Push ctor vtable construction down further. WIP.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86878 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index 4d3c3a5..233bdaf 100644
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -681,10 +681,15 @@
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 @@
&& !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 @@
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 @@
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 @@
CGM.GenerateVTT(RD);
return vtbl;
}
+
+llvm::Constant *CGVtableInfo::getCtorVtable(const CXXRecordDecl *RD,
+ const CXXRecordDecl *Class,
+ uint64_t Offset) {
+ return CGM.GenerateVtable(RD, Class, Offset);
+}
diff --git a/lib/CodeGen/CGVtable.h b/lib/CodeGen/CGVtable.h
index 9620e42..7ad42b5 100644
--- a/lib/CodeGen/CGVtable.h
+++ b/lib/CodeGen/CGVtable.h
@@ -57,8 +57,9 @@
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);
};
}
diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h
index 6c433d9..990706d 100644
--- a/lib/CodeGen/CodeGenModule.h
+++ b/lib/CodeGen/CodeGenModule.h
@@ -253,7 +253,9 @@
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);