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

Simplify getting CXXRecordDecl from a base iterator 

llvm-svn: 185438
This commit is contained in:
Timur Iskhodzhanov 2013-07-02 16:00:40 +00:00
parent 94d6195fdf
commit 7f55a455d1
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
clang/lib/AST/VTableBuilder.cpp
View File

@ -224,8 +224,7 @@ static BaseOffset ComputeBaseOffset(ASTContext &Context,
if (Element.Base->isVirtual()) { if (Element.Base->isVirtual()) {
NonVirtualStart = I; NonVirtualStart = I;
QualType VBaseType = Element.Base->getType(); QualType VBaseType = Element.Base->getType();
VirtualBase = VirtualBase = VBaseType->getAsCXXRecordDecl();
cast<CXXRecordDecl>(VBaseType->getAs<RecordType>()->getDecl());
break; break;
} }
} }
@ -237,8 +236,7 @@ static BaseOffset ComputeBaseOffset(ASTContext &Context,
// Check the base class offset. // Check the base class offset.
const ASTRecordLayout &Layout = Context.getASTRecordLayout(Element.Class); const ASTRecordLayout &Layout = Context.getASTRecordLayout(Element.Class);
const RecordType *BaseType = Element.Base->getType()->getAs<RecordType>(); const CXXRecordDecl *Base = Element.Base->getType()->getAsCXXRecordDecl();
const CXXRecordDecl *Base = cast<CXXRecordDecl>(BaseType->getDecl());
NonVirtualOffset += Layout.getBaseClassOffset(Base); NonVirtualOffset += Layout.getBaseClassOffset(Base);
} }
@ -341,8 +339,7 @@ FinalOverriders::ComputeBaseOffsets(BaseSubobject Base, bool IsVirtual,
// Traverse our bases. // Traverse our bases.
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 *BaseDecl = const CXXRecordDecl *BaseDecl = I->getType()->getAsCXXRecordDecl();
cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
CharUnits BaseOffset; CharUnits BaseOffset;
CharUnits BaseOffsetInLayoutClass; CharUnits BaseOffsetInLayoutClass;
@ -379,8 +376,7 @@ void FinalOverriders::dump(raw_ostream &Out, BaseSubobject Base,
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 *BaseDecl = const CXXRecordDecl *BaseDecl = I->getType()->getAsCXXRecordDecl();
cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
// Ignore bases that don't have any virtual member functions. // Ignore bases that don't have any virtual member functions.
if (!BaseDecl->isPolymorphic()) if (!BaseDecl->isPolymorphic())
@ -725,8 +721,7 @@ void VCallAndVBaseOffsetBuilder::AddVCallOffsets(BaseSubobject Base,
if (I->isVirtual()) if (I->isVirtual())
continue; continue;
const CXXRecordDecl *BaseDecl = const CXXRecordDecl *BaseDecl = I->getType()->getAsCXXRecordDecl();
cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
if (BaseDecl == PrimaryBase) if (BaseDecl == PrimaryBase)
continue; continue;
@ -748,8 +743,7 @@ VCallAndVBaseOffsetBuilder::AddVBaseOffsets(const CXXRecordDecl *RD,
// Add vbase offsets. // Add vbase offsets.
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 *BaseDecl = const CXXRecordDecl *BaseDecl = I->getType()->getAsCXXRecordDecl();
cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
// Check if this is a virtual base that we haven't visited before. // Check if this is a virtual base that we haven't visited before.
if (I->isVirtual() && VisitedVirtualBases.insert(BaseDecl)) { if (I->isVirtual() && VisitedVirtualBases.insert(BaseDecl)) {
@ -1772,8 +1766,7 @@ void VTableBuilder::LayoutSecondaryVTables(BaseSubobject Base,
if (I->isVirtual()) if (I->isVirtual())
continue; continue;
const CXXRecordDecl *BaseDecl = const CXXRecordDecl *BaseDecl = I->getType()->getAsCXXRecordDecl();
cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
// Ignore bases that don't have a vtable. // Ignore bases that don't have a vtable.
if (!BaseDecl->isDynamicClass()) if (!BaseDecl->isDynamicClass())
@ -1849,8 +1842,7 @@ VTableBuilder::DeterminePrimaryVirtualBases(const CXXRecordDecl *RD,
// Traverse bases, looking for more primary virtual bases. // Traverse bases, looking for more primary virtual bases.
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 *BaseDecl = const CXXRecordDecl *BaseDecl = I->getType()->getAsCXXRecordDecl();
cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
CharUnits BaseOffsetInLayoutClass; CharUnits BaseOffsetInLayoutClass;
@ -1881,8 +1873,7 @@ VTableBuilder::LayoutVTablesForVirtualBases(const CXXRecordDecl *RD,
// the classes for which they are primary). // the classes for which they are primary).
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 *BaseDecl = const CXXRecordDecl *BaseDecl = I->getType()->getAsCXXRecordDecl();
cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
// Check if this base needs a vtable. (If it's virtual, not a primary base // Check if this base needs a vtable. (If it's virtual, not a primary base
// of some other class, and we haven't visited it before). // of some other class, and we haven't visited it before).
@ -2362,9 +2353,8 @@ void VTableContext::ComputeVTableRelatedInformation(const CXXRecordDecl *RD) {
if (!RD->getNumVBases()) if (!RD->getNumVBases())
return; return;
const RecordType *VBaseRT = const CXXRecordDecl *VBase =
RD->vbases_begin()->getType()->getAs<RecordType>(); RD->vbases_begin()->getType()->getAsCXXRecordDecl();
const CXXRecordDecl *VBase = cast<CXXRecordDecl>(VBaseRT->getDecl());
if (VirtualBaseClassOffsetOffsets.count(std::make_pair(RD, VBase))) if (VirtualBaseClassOffsetOffsets.count(std::make_pair(RD, VBase)))
return; return;