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

diff --git a/include/clang/Analysis/CFG.h b/include/clang/Analysis/CFG.h
index 992b32a6d74a86c2e2fa127037d13bd715c17c32..03beba59dae562b56dfd1cc393c15dcdafefea3b 100644 (file)
--- 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 fc50071a32c303ef34d3b2b8952fba364a9be4e1..6d8d5c53f60f9973fa5cc3745ab1cd65ef3220e1 100644 (file)
--- 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 84efbd50d1a5b807567f91a59aa43fe1ca56ad6e..710f5ef70fc73e844525e704d48a9ac0332e669a 100644 (file)
--- 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 4fb3732201c7519ff218852cd40ef30c9b01b1f2..5f044ca1794553ce9e10dbafcb10a67b48aae0f1 100644 (file)
--- 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];
+}