diff options
author | Ted Kremenek <kremenek@apple.com> | 2011-03-03 01:21:32 +0000 |
---|---|---|
committer | Ted Kremenek <kremenek@apple.com> | 2011-03-03 01:21:32 +0000 |
commit | c5aff4497e5bfd7523e00b87560c1a5aa65136cc (patch) | |
tree | ffbde3af062dbdb627a5cf1f964a306172eec721 | |
parent | 697d42db6cba7a5994d955ce31be2c097902cf0c (diff) |
Teach CFGImplicitDtor::getDestructorDecl() about arrays of objects with destructors.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@126910 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/Analysis/CFG.h | 4 | ||||
-rw-r--r-- | lib/Analysis/CFG.cpp | 10 | ||||
-rw-r--r-- | lib/Sema/AnalysisBasedWarnings.cpp | 2 | ||||
-rw-r--r-- | test/SemaCXX/return-noreturn.cpp | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/include/clang/Analysis/CFG.h b/include/clang/Analysis/CFG.h index 992b32a6d7..03beba59da 100644 --- a/include/clang/Analysis/CFG.h +++ b/include/clang/Analysis/CFG.h @@ -129,8 +129,8 @@ protected: } public: - const CXXDestructorDecl *getDestructorDecl() const; - bool isNoReturn() const; + const CXXDestructorDecl *getDestructorDecl(ASTContext &astContext) const; + bool isNoReturn(ASTContext &astContext) const; static bool classof(const CFGElement *E) { Kind kind = E->getKind(); diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp index fc50071a32..6d8d5c53f6 100644 --- a/lib/Analysis/CFG.cpp +++ b/lib/Analysis/CFG.cpp @@ -2772,7 +2772,8 @@ CFG* CFG::buildCFG(const Decl *D, Stmt* Statement, ASTContext *C, return Builder.buildCFG(D, Statement, C, BO); } -const CXXDestructorDecl *CFGImplicitDtor::getDestructorDecl() const { +const CXXDestructorDecl * +CFGImplicitDtor::getDestructorDecl(ASTContext &astContext) const { switch (getKind()) { case CFGElement::Invalid: case CFGElement::Statement: @@ -2783,6 +2784,9 @@ const CXXDestructorDecl *CFGImplicitDtor::getDestructorDecl() const { const VarDecl *var = cast<CFGAutomaticObjDtor>(this)->getVarDecl(); QualType ty = var->getType(); ty = ty.getNonReferenceType(); + if (const ArrayType *arrayType = astContext.getAsArrayType(ty)) { + ty = arrayType->getElementType(); + } const RecordType *recordType = ty->getAs<RecordType>(); const CXXRecordDecl *classDecl = cast<CXXRecordDecl>(recordType->getDecl()); @@ -2804,8 +2808,8 @@ const CXXDestructorDecl *CFGImplicitDtor::getDestructorDecl() const { return 0; } -bool CFGImplicitDtor::isNoReturn() const { - if (const CXXDestructorDecl *cdecl = getDestructorDecl()) { +bool CFGImplicitDtor::isNoReturn(ASTContext &astContext) const { + if (const CXXDestructorDecl *cdecl = getDestructorDecl(astContext)) { QualType ty = cdecl->getType(); return cast<FunctionType>(ty)->getNoReturnAttr(); } diff --git a/lib/Sema/AnalysisBasedWarnings.cpp b/lib/Sema/AnalysisBasedWarnings.cpp index 84efbd50d1..710f5ef70f 100644 --- a/lib/Sema/AnalysisBasedWarnings.cpp +++ b/lib/Sema/AnalysisBasedWarnings.cpp @@ -137,7 +137,7 @@ static ControlFlowKind CheckFallThrough(AnalysisContext &AC) { // FIXME: The right solution is to just sever the edges in the // CFG itself. if (const CFGImplicitDtor *iDtor = ri->getAs<CFGImplicitDtor>()) - if (iDtor->isNoReturn()) { + if (iDtor->isNoReturn(AC.getASTContext())) { hasNoReturnDtor = true; HasFakeEdge = true; break; diff --git a/test/SemaCXX/return-noreturn.cpp b/test/SemaCXX/return-noreturn.cpp index 4fb3732201..5f044ca179 100644 --- a/test/SemaCXX/return-noreturn.cpp +++ b/test/SemaCXX/return-noreturn.cpp @@ -39,3 +39,7 @@ void test_PR9380(const PR9380& aKey) { const PR9380& flatKey = PR9380_B(aKey); } +// Array of objects with destructors. This is purely a coverage test case. +void test_array() { + PR9380 a[2]; +} |