only traverse the dtor's statements once

rather than twice, once implicitly from TraverseCXXDestructorDecl and
explicitly from VisitCXXDestructorDecl

Change-Id: I62a794faa530f2b54b82c86de0629afa28f30091
Reviewed-on: https://gerrit.libreoffice.org/27139
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/compilerplugins/clang/fragiledestructor.cxx b/compilerplugins/clang/fragiledestructor.cxx
index ebce1d677f8b..d4b7e6136ea6 100644
--- a/compilerplugins/clang/fragiledestructor.cxx
+++ b/compilerplugins/clang/fragiledestructor.cxx
@@ -29,7 +29,7 @@ public:
 
     virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
 
-    bool VisitCXXDestructorDecl(const CXXDestructorDecl *);
+    bool TraverseCXXDestructorDecl(CXXDestructorDecl *);
 
     bool VisitCXXMemberCallExpr(const CXXMemberCallExpr *);
 
@@ -37,13 +37,13 @@ private:
     bool mbChecking = false;
 };
 
-bool FragileDestructor::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorDecl)
+bool FragileDestructor::TraverseCXXDestructorDecl(CXXDestructorDecl* pCXXDestructorDecl)
 {
     if (ignoreLocation(pCXXDestructorDecl)) {
-        return true;
+        return RecursiveASTVisitor::TraverseCXXDestructorDecl(pCXXDestructorDecl);
     }
     if (!pCXXDestructorDecl->isThisDeclarationADefinition()) {
-        return true;
+        return RecursiveASTVisitor::TraverseCXXDestructorDecl(pCXXDestructorDecl);
     }
     // ignore this for now, too tricky for me to work out
     StringRef aFileName = compiler.getSourceManager().getFilename(
@@ -55,12 +55,11 @@ bool FragileDestructor::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDest
         // dont know how to detect this in clang - it is making an explicit call to it's own method, so presumably OK
         || aFileName == SRCDIR "/basic/source/sbx/sbxvalue.cxx"
        )
-        return true;
+        return RecursiveASTVisitor::TraverseCXXDestructorDecl(pCXXDestructorDecl);
     mbChecking = true;
-    Stmt * pStmt = pCXXDestructorDecl->getBody();
-    TraverseStmt(pStmt);
+    bool ret = RecursiveASTVisitor::TraverseCXXDestructorDecl(pCXXDestructorDecl);
     mbChecking = false;
-    return true;
+    return ret;
 }
 
 bool FragileDestructor::VisitCXXMemberCallExpr(const CXXMemberCallExpr* callExpr)