maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use construction vtables when needed. This is currently guarded by -fdump-vtable-layouts since it doesn't work 100% yet :) 

llvm-svn: 99787
This commit is contained in:
Anders Carlsson 2010-03-29 01:08:49 +00:00
parent 8baeaf0a26
commit 5889027ccc
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
clang/lib/CodeGen/CGClass.cpp
View File

@ -1561,14 +1561,38 @@ CodeGenFunction::InitializeVTablePointer(BaseSubobject Base,
bool BaseIsMorallyVirtual, bool BaseIsMorallyVirtual,
llvm::Constant *VTable, llvm::Constant *VTable,
const CXXRecordDecl *VTableClass) { const CXXRecordDecl *VTableClass) {
const CXXRecordDecl *RD = Base.getBase();
// Compute the address point. // Compute the address point.
const CodeGenVTables::AddrSubMap_t& AddressPoints = llvm::Value *VTableAddressPoint;
CGM.getVTables().getAddressPoints(VTableClass);
uint64_t AddressPoint = // FIXME: Always use the new vtable code once we know it works.
AddressPoints.lookup(std::make_pair(Base.getBase(), Base.getBaseOffset())); bool UseNewVTableCode = CGM.getLangOptions().DumpVtableLayouts;
llvm::Value *VTableAddressPoint =
// Check if we need to use a vtable from the VTT.
if (UseNewVTableCode && CodeGenVTables::needsVTTParameter(CurGD) &&
(RD->getNumVBases() || BaseIsMorallyVirtual)) {
// Get the secondary vpointer index.
uint64_t VirtualPointerIndex =
CGM.getVTables().getSecondaryVirtualPointerIndex(VTableClass, Base);
/// Load the VTT.
llvm::Value *VTT = LoadCXXVTT();
if (VirtualPointerIndex)
VTT = Builder.CreateConstInBoundsGEP1_64(VTT, VirtualPointerIndex);
// And load the address point from the VTT.
VTableAddressPoint = Builder.CreateLoad(VTT);
} else {
const CodeGenVTables::AddrSubMap_t& AddressPoints =
CGM.getVTables().getAddressPoints(VTableClass);
uint64_t AddressPoint =
AddressPoints.lookup(std::make_pair(Base.getBase(),
Base.getBaseOffset()));
VTableAddressPoint =
Builder.CreateConstInBoundsGEP2_64(VTable, 0, AddressPoint); Builder.CreateConstInBoundsGEP2_64(VTable, 0, AddressPoint);
}
// Compute where to store the address point. // Compute where to store the address point.
const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(CGM.getLLVMContext()); const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(CGM.getLLVMContext());