Refine vtable layout for virtual bases and keep better track of
primaries. WIP. llvm-svn: 78950
This commit is contained in:
parent
55f1c09e31
commit
c2f591b1e6
|
@ -26,14 +26,15 @@ ASTRecordLayoutBuilder::ASTRecordLayoutBuilder(ASTContext &Ctx)
|
||||||
NextOffset(0), IsUnion(false), NonVirtualSize(0), NonVirtualAlignment(8) {}
|
NextOffset(0), IsUnion(false), NonVirtualSize(0), NonVirtualAlignment(8) {}
|
||||||
|
|
||||||
/// LayoutVtable - Lay out the vtable and set PrimaryBase.
|
/// LayoutVtable - Lay out the vtable and set PrimaryBase.
|
||||||
void ASTRecordLayoutBuilder::LayoutVtable(const CXXRecordDecl *RD) {
|
void ASTRecordLayoutBuilder::LayoutVtable(const CXXRecordDecl *RD,
|
||||||
|
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary) {
|
||||||
if (!RD->isDynamicClass()) {
|
if (!RD->isDynamicClass()) {
|
||||||
// There is no primary base in this case.
|
// There is no primary base in this case.
|
||||||
setPrimaryBase(0, false);
|
setPrimaryBase(0, false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectPrimaryBase(RD);
|
SelectPrimaryBase(RD, IndirectPrimary);
|
||||||
if (PrimaryBase == 0) {
|
if (PrimaryBase == 0) {
|
||||||
int AS = 0;
|
int AS = 0;
|
||||||
UpdateAlignment(Ctx.Target.getPointerAlign(AS));
|
UpdateAlignment(Ctx.Target.getPointerAlign(AS));
|
||||||
|
@ -85,9 +86,8 @@ void ASTRecordLayoutBuilder::SelectPrimaryForBase(const CXXRecordDecl *RD,
|
||||||
cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
|
cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
|
||||||
// Only bases with virtual bases participate in computing the
|
// Only bases with virtual bases participate in computing the
|
||||||
// indirect primary virtual base classes.
|
// indirect primary virtual base classes.
|
||||||
if (Base->getNumVBases() == 0)
|
if (Base->getNumVBases())
|
||||||
continue;
|
SelectPrimaryForBase(Base, IndirectPrimary);
|
||||||
SelectPrimaryForBase(Base, IndirectPrimary);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -117,7 +117,8 @@ void ASTRecordLayoutBuilder::SelectPrimaryVBase(const CXXRecordDecl *RD,
|
||||||
|
|
||||||
/// SelectPrimaryBase - Selects the primary base for the given class and
|
/// SelectPrimaryBase - Selects the primary base for the given class and
|
||||||
/// record that with setPrimaryBase.
|
/// record that with setPrimaryBase.
|
||||||
void ASTRecordLayoutBuilder::SelectPrimaryBase(const CXXRecordDecl *RD) {
|
void ASTRecordLayoutBuilder::SelectPrimaryBase(const CXXRecordDecl *RD,
|
||||||
|
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary) {
|
||||||
// The primary base is the first non-virtual indirect or direct base class,
|
// The primary base is the first non-virtual indirect or direct base class,
|
||||||
// if one exists.
|
// if one exists.
|
||||||
for (CXXRecordDecl::base_class_const_iterator i = RD->bases_begin(),
|
for (CXXRecordDecl::base_class_const_iterator i = RD->bases_begin(),
|
||||||
|
@ -146,7 +147,6 @@ void ASTRecordLayoutBuilder::SelectPrimaryBase(const CXXRecordDecl *RD) {
|
||||||
// First, we compute all the primary virtual bases for all of our direct and
|
// First, we compute all the primary virtual bases for all of our direct and
|
||||||
// indirect bases, and record all their primary virtual base classes.
|
// indirect bases, and record all their primary virtual base classes.
|
||||||
const CXXRecordDecl *FirstPrimary = 0;
|
const CXXRecordDecl *FirstPrimary = 0;
|
||||||
llvm::SmallSet<const CXXRecordDecl*, 32> IndirectPrimary;
|
|
||||||
for (CXXRecordDecl::base_class_const_iterator i = RD->bases_begin(),
|
for (CXXRecordDecl::base_class_const_iterator i = RD->bases_begin(),
|
||||||
e = RD->bases_end(); i != e; ++i) {
|
e = RD->bases_end(); i != e; ++i) {
|
||||||
const CXXRecordDecl *Base =
|
const CXXRecordDecl *Base =
|
||||||
|
@ -169,13 +169,19 @@ void ASTRecordLayoutBuilder::LayoutVirtualBase(const CXXRecordDecl *RD) {
|
||||||
|
|
||||||
void ASTRecordLayoutBuilder::LayoutVirtualBases(const CXXRecordDecl *RD,
|
void ASTRecordLayoutBuilder::LayoutVirtualBases(const CXXRecordDecl *RD,
|
||||||
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary) {
|
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary) {
|
||||||
// FIXME: Though complete, this is the wrong order
|
// FIXME: Calculate IndirectPrimary when !PrimaryBaseWasVirtual
|
||||||
for (CXXRecordDecl::base_class_const_iterator i = RD->vbases_begin(),
|
// assert(PrimaryBaseWasVirtual && "FIXME: calculate IndirectPrimary");
|
||||||
e = RD->vbases_end(); i != e; ++i) {
|
for (CXXRecordDecl::base_class_const_iterator i = RD->bases_begin(),
|
||||||
|
e = RD->bases_end(); i != e; ++i) {
|
||||||
const CXXRecordDecl *Base =
|
const CXXRecordDecl *Base =
|
||||||
cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
|
cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
|
||||||
if (!IndirectPrimary.count(Base))
|
if (i->isVirtual() && !IndirectPrimary.count(Base)) {
|
||||||
|
// Mark it so we don't output it twice.
|
||||||
|
IndirectPrimary.insert(Base);
|
||||||
LayoutVirtualBase(Base);
|
LayoutVirtualBase(Base);
|
||||||
|
}
|
||||||
|
if (Base->getNumVBases())
|
||||||
|
LayoutVirtualBases(Base, IndirectPrimary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -216,13 +222,12 @@ void ASTRecordLayoutBuilder::Layout(const RecordDecl *D) {
|
||||||
if (const AlignedAttr *AA = D->getAttr<AlignedAttr>())
|
if (const AlignedAttr *AA = D->getAttr<AlignedAttr>())
|
||||||
UpdateAlignment(AA->getAlignment());
|
UpdateAlignment(AA->getAlignment());
|
||||||
|
|
||||||
// FIXME: Calculate this completely.
|
|
||||||
llvm::SmallSet<const CXXRecordDecl*, 32> IndirectPrimary;
|
llvm::SmallSet<const CXXRecordDecl*, 32> IndirectPrimary;
|
||||||
|
|
||||||
// If this is a C++ class, lay out the nonvirtual bases.
|
// If this is a C++ class, lay out the nonvirtual bases.
|
||||||
const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D);
|
const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D);
|
||||||
if (RD) {
|
if (RD) {
|
||||||
LayoutVtable(RD);
|
LayoutVtable(RD, IndirectPrimary);
|
||||||
// PrimaryBase goes first.
|
// PrimaryBase goes first.
|
||||||
if (PrimaryBase) {
|
if (PrimaryBase) {
|
||||||
// FIXME: We need all the primaries.
|
// FIXME: We need all the primaries.
|
||||||
|
|
|
@ -53,7 +53,8 @@ class ASTRecordLayoutBuilder {
|
||||||
void LayoutFields(const RecordDecl *D);
|
void LayoutFields(const RecordDecl *D);
|
||||||
void LayoutField(const FieldDecl *D);
|
void LayoutField(const FieldDecl *D);
|
||||||
|
|
||||||
void SelectPrimaryBase(const CXXRecordDecl *RD);
|
void SelectPrimaryBase(const CXXRecordDecl *RD,
|
||||||
|
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary);
|
||||||
void SelectPrimaryVBase(const CXXRecordDecl *RD,
|
void SelectPrimaryVBase(const CXXRecordDecl *RD,
|
||||||
const CXXRecordDecl *&FirstPrimary,
|
const CXXRecordDecl *&FirstPrimary,
|
||||||
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary);
|
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary);
|
||||||
|
@ -64,7 +65,8 @@ class ASTRecordLayoutBuilder {
|
||||||
PrimaryBaseWasVirtual = Virtual;
|
PrimaryBaseWasVirtual = Virtual;
|
||||||
}
|
}
|
||||||
bool IsNearlyEmpty(const CXXRecordDecl *RD);
|
bool IsNearlyEmpty(const CXXRecordDecl *RD);
|
||||||
void LayoutVtable(const CXXRecordDecl *RD);
|
void LayoutVtable(const CXXRecordDecl *RD,
|
||||||
|
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary);
|
||||||
void LayoutNonVirtualBases(const CXXRecordDecl *RD);
|
void LayoutNonVirtualBases(const CXXRecordDecl *RD);
|
||||||
void LayoutBaseNonVirtually(const CXXRecordDecl *RD);
|
void LayoutBaseNonVirtually(const CXXRecordDecl *RD);
|
||||||
void LayoutVirtualBase(const CXXRecordDecl *RD);
|
void LayoutVirtualBase(const CXXRecordDecl *RD);
|
||||||
|
|
|
@ -617,10 +617,10 @@ llvm::Constant *CodeGenFunction::GenerateRtti(const CXXRecordDecl *RD) {
|
||||||
llvm::GlobalVariable::LinkageTypes linktype;
|
llvm::GlobalVariable::LinkageTypes linktype;
|
||||||
linktype = llvm::GlobalValue::WeakAnyLinkage;
|
linktype = llvm::GlobalValue::WeakAnyLinkage;
|
||||||
std::vector<llvm::Constant *> info;
|
std::vector<llvm::Constant *> info;
|
||||||
// assert (0 && "FIXME: implement rtti descriptor");
|
// assert(0 && "FIXME: implement rtti descriptor");
|
||||||
// FIXME: descriptor
|
// FIXME: descriptor
|
||||||
info.push_back(llvm::Constant::getNullValue(Ptr8Ty));
|
info.push_back(llvm::Constant::getNullValue(Ptr8Ty));
|
||||||
// assert (0 && "FIXME: implement rtti ts");
|
// assert(0 && "FIXME: implement rtti ts");
|
||||||
// FIXME: TS
|
// FIXME: TS
|
||||||
info.push_back(llvm::Constant::getNullValue(Ptr8Ty));
|
info.push_back(llvm::Constant::getNullValue(Ptr8Ty));
|
||||||
|
|
||||||
|
@ -666,6 +666,25 @@ void CodeGenFunction::GenerateMethods(std::vector<llvm::Constant *> &methods,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CodeGenFunction::GenerateVtableForVBases(const CXXRecordDecl *RD,
|
||||||
|
llvm::Constant *rtti,
|
||||||
|
std::vector<llvm::Constant *> &methods,
|
||||||
|
llvm::SmallSet<const CXXRecordDecl *, 32> &IndirectPrimary) {
|
||||||
|
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());
|
||||||
|
if (i->isVirtual() && !IndirectPrimary.count(Base)) {
|
||||||
|
// Mark it so we don't output it twice.
|
||||||
|
IndirectPrimary.insert(Base);
|
||||||
|
GenerateVtableForBase(Base, RD, rtti, methods, false, true,
|
||||||
|
IndirectPrimary);
|
||||||
|
}
|
||||||
|
if (Base->getNumVBases())
|
||||||
|
GenerateVtableForVBases(Base, rtti, methods, IndirectPrimary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void CodeGenFunction::GenerateVtableForBase(const CXXRecordDecl *RD,
|
void CodeGenFunction::GenerateVtableForBase(const CXXRecordDecl *RD,
|
||||||
const CXXRecordDecl *Class,
|
const CXXRecordDecl *Class,
|
||||||
llvm::Constant *rtti,
|
llvm::Constant *rtti,
|
||||||
|
@ -776,15 +795,8 @@ llvm::Value *CodeGenFunction::GenerateVtable(const CXXRecordDecl *RD) {
|
||||||
IndirectPrimary);
|
IndirectPrimary);
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: Though complete, this is the wrong order
|
// Then come the vtables for all the virtual bases.
|
||||||
for (CXXRecordDecl::base_class_const_iterator i = RD->vbases_begin(),
|
GenerateVtableForVBases(RD, rtti, methods, IndirectPrimary);
|
||||||
e = RD->vbases_end(); i != e; ++i) {
|
|
||||||
const CXXRecordDecl *Base =
|
|
||||||
cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
|
|
||||||
if (!IndirectPrimary.count(Base))
|
|
||||||
GenerateVtableForBase(Base, RD, rtti, methods, false, true,
|
|
||||||
IndirectPrimary);
|
|
||||||
}
|
|
||||||
|
|
||||||
llvm::Constant *C;
|
llvm::Constant *C;
|
||||||
llvm::ArrayType *type = llvm::ArrayType::get(Ptr8Ty, methods.size());
|
llvm::ArrayType *type = llvm::ArrayType::get(Ptr8Ty, methods.size());
|
||||||
|
|
|
@ -363,6 +363,10 @@ public:
|
||||||
const CXXRecordDecl *RD, llvm::Type *Ptr8Ty);
|
const CXXRecordDecl *RD, llvm::Type *Ptr8Ty);
|
||||||
void GenerateMethods(std::vector<llvm::Constant *> &methods,
|
void GenerateMethods(std::vector<llvm::Constant *> &methods,
|
||||||
const CXXRecordDecl *RD, llvm::Type *Ptr8Ty);
|
const CXXRecordDecl *RD, llvm::Type *Ptr8Ty);
|
||||||
|
void GenerateVtableForVBases(const CXXRecordDecl *RD,
|
||||||
|
llvm::Constant *rtti,
|
||||||
|
std::vector<llvm::Constant *> &methods,
|
||||||
|
llvm::SmallSet<const CXXRecordDecl *, 32> &IndirectPrimary);
|
||||||
void GenerateVtableForBase(const CXXRecordDecl *RD,
|
void GenerateVtableForBase(const CXXRecordDecl *RD,
|
||||||
const CXXRecordDecl *Class,
|
const CXXRecordDecl *Class,
|
||||||
llvm::Constant *rtti,
|
llvm::Constant *rtti,
|
||||||
|
|
|
@ -224,7 +224,7 @@ struct test5_D : virtual test5_B1, virtual test5_B21, virtual test5_B31 {
|
||||||
// CHECK-LP32 .long -4
|
// CHECK-LP32 .long -4
|
||||||
// CHECK-LP32: .long __ZTI7test5_D
|
// CHECK-LP32: .long __ZTI7test5_D
|
||||||
// CHECK-LP32: .long __ZN9test5_B237funcB23Ev
|
// CHECK-LP32: .long __ZN9test5_B237funcB23Ev
|
||||||
// CHECK-LP32: .long __ZN9test5_B227funcB22Ev
|
// CHECK-LP32 .long __ZN9test5_B227funcB22Ev
|
||||||
// CHECK-LP32 .long __ZN9test5_B217funcB21Ev
|
// CHECK-LP32 .long __ZN9test5_B217funcB21Ev
|
||||||
// CHECK-LP32 .space 4
|
// CHECK-LP32 .space 4
|
||||||
// CHECK-LP32 .long 8
|
// CHECK-LP32 .long 8
|
||||||
|
@ -276,7 +276,7 @@ struct test5_D : virtual test5_B1, virtual test5_B21, virtual test5_B31 {
|
||||||
// CHECK-LP64 .quad 18446744073709551608
|
// CHECK-LP64 .quad 18446744073709551608
|
||||||
// CHECK-LP64: .quad __ZTI7test5_D
|
// CHECK-LP64: .quad __ZTI7test5_D
|
||||||
// CHECK-LP64: .quad __ZN9test5_B237funcB23Ev
|
// CHECK-LP64: .quad __ZN9test5_B237funcB23Ev
|
||||||
// CHECK-LP64: .quad __ZN9test5_B227funcB22Ev
|
// CHECK-LP64 .quad __ZN9test5_B227funcB22Ev
|
||||||
// CHECK-LP64 .quad __ZN9test5_B217funcB21Ev
|
// CHECK-LP64 .quad __ZN9test5_B217funcB21Ev
|
||||||
// CHECK-LP64 .space 8
|
// CHECK-LP64 .space 8
|
||||||
// CHECK-LP64 .quad 16
|
// CHECK-LP64 .quad 16
|
||||||
|
|
Loading…
Reference in New Issue