replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move CollectIvarsToConstructOrDestruct to Sema 

from AST, consider ivar array of objects
(per Doug's comment).

llvm-svn: 102446
This commit is contained in:
Fariborz Jahanian 2010-04-27 17:18:58 +00:00
parent 2e3197e60b
commit 38b77a9d8e
4 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/AST/ASTContext.h
View File

@ -957,9 +957,6 @@ public:
llvm::SmallVectorImpl<ObjCIvarDecl*> &Ivars);
void CollectNonClassIvars(const ObjCInterfaceDecl *OI,
llvm::SmallVectorImpl<ObjCIvarDecl*> &Ivars);
void CollectIvarsToConstructOrDestruct(const ObjCInterfaceDecl *OI,
llvm::SmallVectorImpl<ObjCIvarDecl*> &Ivars,
bool construct=true);
unsigned CountNonClassIvars(const ObjCInterfaceDecl *OI);
void CollectInheritedProtocols(const Decl *CDecl,
llvm::SmallPtrSet<ObjCProtocolDecl*, 8> &Protocols);

49
clang/lib/AST/ASTContext.cpp
View File

@ -807,55 +807,6 @@ void ASTContext::CollectInheritedProtocols(const Decl *CDecl,
}
}
/// CollectIvarsToConstructOrDestruct - Collect those ivars which require
/// construction (construct=true) or destruction (construct=false)
///
void ASTContext::CollectIvarsToConstructOrDestruct(const ObjCInterfaceDecl *OI,
llvm::SmallVectorImpl<ObjCIvarDecl*> &Ivars,
bool construct) {
if (!getLangOptions().CPlusPlus)
return;
for (ObjCInterfaceDecl::ivar_iterator I = OI->ivar_begin(),
E = OI->ivar_end(); I != E; ++I) {
ObjCIvarDecl *Iv = (*I);
if (const RecordType *RT = Iv->getType()->getAs<RecordType>()) {
if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl()))
if (construct && !RD->hasTrivialConstructor() ||
!construct && !RD->hasTrivialDestructor())
Ivars.push_back(*I);
}
}
// Find ivars to construct/destruct in class extension.
if (const ObjCCategoryDecl *CDecl = OI->getClassExtension()) {
for (ObjCCategoryDecl::ivar_iterator I = CDecl->ivar_begin(),
E = CDecl->ivar_end(); I != E; ++I) {
ObjCIvarDecl *Iv = (*I);
if (const RecordType *RT = Iv->getType()->getAs<RecordType>()) {
if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl()))
if (construct && !RD->hasTrivialConstructor() ||
!construct && !RD->hasTrivialDestructor())
Ivars.push_back(*I);
}
}
}
// Also add any ivar defined in this class's implementation. This
// includes synthesized ivars.
if (ObjCImplementationDecl *ImplDecl = OI->getImplementation()) {
for (ObjCImplementationDecl::ivar_iterator I = ImplDecl->ivar_begin(),
E = ImplDecl->ivar_end(); I != E; ++I) {
ObjCIvarDecl *Iv = (*I);
if (const RecordType *RT = Iv->getType()->getAs<RecordType>()) {
if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl()))
if (construct && !RD->hasTrivialConstructor() ||
!construct && !RD->hasTrivialDestructor())
Ivars.push_back(*I);
}
}
}
}
unsigned ASTContext::CountNonClassIvars(const ObjCInterfaceDecl *OI) {
unsigned count = 0;
// Count ivars declared in class extension.

6
clang/lib/Sema/Sema.h
View File

@ -1590,6 +1590,12 @@ public:
/// AddFactoryMethodToGlobalPool - Same as above, but for factory methods.
void AddFactoryMethodToGlobalPool(ObjCMethodDecl *Method);
/// CollectIvarsToConstructOrDestruct - Collect those ivars which require
/// construction (construct=true) or destruction (construct=false)
void CollectIvarsToConstructOrDestruct(const ObjCInterfaceDecl *OI,
llvm::SmallVectorImpl<ObjCIvarDecl*> &Ivars,
bool construct=true);
//===--------------------------------------------------------------------===//
// Statement Parsing Callbacks: SemaStmt.cpp.
public:

52
clang/lib/Sema/SemaDeclObjC.cpp
View File

@ -1798,3 +1798,55 @@ Sema::DeclPtrTy Sema::ActOnObjCExceptionDecl(Scope *S, Declarator &D) {
Diag(New->getLocation(), diag::err_block_on_nonlocal);
return DeclPtrTy::make(New);
}
/// CollectIvarsToConstructOrDestruct - Collect those ivars which require
/// construction (construct=true) or destruction (construct=false)
///
void Sema::CollectIvarsToConstructOrDestruct(const ObjCInterfaceDecl *OI,
llvm::SmallVectorImpl<ObjCIvarDecl*> &Ivars,
bool construct) {
if (!getLangOptions().CPlusPlus)
return;
for (ObjCInterfaceDecl::ivar_iterator I = OI->ivar_begin(),
E = OI->ivar_end(); I != E; ++I) {
ObjCIvarDecl *Iv = (*I);
QualType QT = Context.getBaseElementType(Iv->getType());
if (const RecordType *RT = QT->getAs<RecordType>()) {
if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl()))
if (construct && !RD->hasTrivialConstructor() ||
!construct && !RD->hasTrivialDestructor())
Ivars.push_back(*I);
}
}
// Find ivars to construct/destruct in class extension.
if (const ObjCCategoryDecl *CDecl = OI->getClassExtension()) {
for (ObjCCategoryDecl::ivar_iterator I = CDecl->ivar_begin(),
E = CDecl->ivar_end(); I != E; ++I) {
ObjCIvarDecl *Iv = (*I);
QualType QT = Context.getBaseElementType(Iv->getType());
if (const RecordType *RT = QT->getAs<RecordType>()) {
if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl()))
if (construct && !RD->hasTrivialConstructor() ||
!construct && !RD->hasTrivialDestructor())
Ivars.push_back(*I);
}
}
}
// Also add any ivar defined in this class's implementation. This
// includes synthesized ivars.
if (ObjCImplementationDecl *ImplDecl = OI->getImplementation()) {
for (ObjCImplementationDecl::ivar_iterator I = ImplDecl->ivar_begin(),
E = ImplDecl->ivar_end(); I != E; ++I) {
ObjCIvarDecl *Iv = (*I);
QualType QT = Context.getBaseElementType(Iv->getType());
if (const RecordType *RT = QT->getAs<RecordType>()) {
if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl()))
if (construct && !RD->hasTrivialConstructor() ||
!construct && !RD->hasTrivialDestructor())
Ivars.push_back(*I);
}
}
}
}