Remove the IndirectPrimary parameter in LayoutVirtualBases; it's already there as a member variable.
llvm-svn: 98211
This commit is contained in:
parent
c499fae068
commit
aa87b4eab1
|
@ -181,7 +181,6 @@ ASTRecordLayoutBuilder::LayoutNonVirtualBases(const CXXRecordDecl *RD) {
|
||||||
|
|
||||||
// If we have a primary base class, lay it out.
|
// If we have a primary base class, lay it out.
|
||||||
if (const CXXRecordDecl *Base = PrimaryBase.getBase()) {
|
if (const CXXRecordDecl *Base = PrimaryBase.getBase()) {
|
||||||
printf("found primary base %s\n", Base->getQualifiedNameAsString().c_str());
|
|
||||||
if (PrimaryBase.isVirtual()) {
|
if (PrimaryBase.isVirtual()) {
|
||||||
// We have a virtual primary base, insert it as an indirect primary base.
|
// We have a virtual primary base, insert it as an indirect primary base.
|
||||||
IndirectPrimaryBases.insert(Base);
|
IndirectPrimaryBases.insert(Base);
|
||||||
|
@ -223,8 +222,7 @@ void ASTRecordLayoutBuilder::LayoutVirtualBases(const CXXRecordDecl *Class,
|
||||||
const CXXRecordDecl *RD,
|
const CXXRecordDecl *RD,
|
||||||
const CXXRecordDecl *PB,
|
const CXXRecordDecl *PB,
|
||||||
uint64_t Offset,
|
uint64_t Offset,
|
||||||
llvm::SmallSet<const CXXRecordDecl*, 32> &mark,
|
llvm::SmallSet<const CXXRecordDecl*, 32> &mark) {
|
||||||
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) {
|
||||||
assert(!i->getType()->isDependentType() &&
|
assert(!i->getType()->isDependentType() &&
|
||||||
|
@ -239,9 +237,9 @@ void ASTRecordLayoutBuilder::LayoutVirtualBases(const CXXRecordDecl *Class,
|
||||||
continue;
|
continue;
|
||||||
// Mark it so we don't lay it out twice.
|
// Mark it so we don't lay it out twice.
|
||||||
mark.insert(Base);
|
mark.insert(Base);
|
||||||
assert (IndirectPrimary.count(Base) && "IndirectPrimary was wrong");
|
assert (IndirectPrimaryBases.count(Base) && "IndirectPrimary was wrong");
|
||||||
VBases.push_back(std::make_pair(Base, Offset));
|
VBases.push_back(std::make_pair(Base, Offset));
|
||||||
} else if (IndirectPrimary.count(Base)) {
|
} else if (IndirectPrimaryBases.count(Base)) {
|
||||||
// Someone else will eventually lay this out.
|
// Someone else will eventually lay this out.
|
||||||
;
|
;
|
||||||
} else {
|
} else {
|
||||||
|
@ -265,8 +263,7 @@ void ASTRecordLayoutBuilder::LayoutVirtualBases(const CXXRecordDecl *Class,
|
||||||
if (Base->getNumVBases()) {
|
if (Base->getNumVBases()) {
|
||||||
const ASTRecordLayout &Layout = Ctx.getASTRecordLayout(Base);
|
const ASTRecordLayout &Layout = Ctx.getASTRecordLayout(Base);
|
||||||
const CXXRecordDecl *PrimaryBase = Layout.getPrimaryBaseInfo().getBase();
|
const CXXRecordDecl *PrimaryBase = Layout.getPrimaryBaseInfo().getBase();
|
||||||
LayoutVirtualBases(Class, Base, PrimaryBase, BaseOffset, mark,
|
LayoutVirtualBases(Class, Base, PrimaryBase, BaseOffset, mark);
|
||||||
IndirectPrimary);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -490,8 +487,7 @@ void ASTRecordLayoutBuilder::Layout(const RecordDecl *D) {
|
||||||
|
|
||||||
if (RD) {
|
if (RD) {
|
||||||
llvm::SmallSet<const CXXRecordDecl*, 32> mark;
|
llvm::SmallSet<const CXXRecordDecl*, 32> mark;
|
||||||
LayoutVirtualBases(RD, RD, PrimaryBase.getBase(),
|
LayoutVirtualBases(RD, RD, PrimaryBase.getBase(), 0, mark);
|
||||||
0, mark, IndirectPrimaryBases);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finally, round the size of the total struct up to the alignment of the
|
// Finally, round the size of the total struct up to the alignment of the
|
||||||
|
|
|
@ -114,8 +114,7 @@ class ASTRecordLayoutBuilder {
|
||||||
/// LayoutVirtualBases - Lays out all the virtual bases.
|
/// LayoutVirtualBases - Lays out all the virtual bases.
|
||||||
void LayoutVirtualBases(const CXXRecordDecl *Class, const CXXRecordDecl *RD,
|
void LayoutVirtualBases(const CXXRecordDecl *Class, const CXXRecordDecl *RD,
|
||||||
const CXXRecordDecl *PB, uint64_t Offset,
|
const CXXRecordDecl *PB, uint64_t Offset,
|
||||||
llvm::SmallSet<const CXXRecordDecl*, 32> &mark,
|
llvm::SmallSet<const CXXRecordDecl*, 32> &mark);
|
||||||
llvm::SmallSet<const CXXRecordDecl*, 32> &IndirectPrimary);
|
|
||||||
|
|
||||||
/// LayoutVirtualBase - Lays out a single virtual base.
|
/// LayoutVirtualBase - Lays out a single virtual base.
|
||||||
void LayoutVirtualBase(const CXXRecordDecl *RD);
|
void LayoutVirtualBase(const CXXRecordDecl *RD);
|
||||||
|
|
Loading…
Reference in New Issue