Revert "Adapt to changed clang::ASTContext::getParents behavior on Clang 11 trunk"

This reverts commit 09aa5a9be8b9b3c88cf25b85e0eda28c5ef19aa4, now that
<https://github.com/llvm/llvm-project/commit/
551092bc3dfb86f1e11a55f3bee0c8ee1be6fdd6> "Revert AST Matchers default to AsIs
mode" reverted the Clang commit that prompted this compilerplugins change.

Change-Id: I75c8b4cb2894cd67a791db460f2886a783856c73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100026
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

11 files changed, 32 insertions, 81 deletions

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 8a1a728bd95b..ed9d3ec942dc 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -24,12 +24,6 @@
 
 #include "config_clang.h"
 
-#if CLANG_VERSION >= 110000
-namespace clang { class DynTypedNodeList; }
-#else
-#include "clang/AST/ASTContext.h"
-#endif
-
 // Compatibility wrapper to abstract over (trivial) changes in the Clang API:
 namespace compat {
 
@@ -306,12 +300,6 @@ inline clang::QualType getDeclaredReturnType(clang::FunctionDecl const * decl) {
 #endif
 }
 
-#if CLANG_VERSION >= 110000
-using DynTypedNodeList = clang::DynTypedNodeList;
-#else
-using DynTypedNodeList = clang::ASTContext::DynTypedNodeList;
-#endif
-
 }
 
 #endif
diff --git a/compilerplugins/clang/constfields.cxx b/compilerplugins/clang/constfields.cxx
index b06773c55047..635774810717 100644
--- a/compilerplugins/clang/constfields.cxx
+++ b/compilerplugins/clang/constfields.cxx
@@ -360,7 +360,7 @@ bool ConstFields::VisitMemberExpr(const MemberExpr* memberExpr)
 
 void ConstFields::check(const FieldDecl* fieldDecl, const Expr* memberExpr)
 {
-    auto parentsRange = getParents(*memberExpr);
+    auto parentsRange = compiler.getASTContext().getParents(*memberExpr);
     const Stmt* child = memberExpr;
     const Stmt* parent
         = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
@@ -369,7 +369,7 @@ void ConstFields::check(const FieldDecl* fieldDecl, const Expr* memberExpr)
     bool bDump = false;
     auto walkUp = [&]() {
         child = parent;
-        auto parentsRange = getParents(*parent);
+        auto parentsRange = compiler.getASTContext().getParents(*parent);
         parent = parentsRange.begin() == parentsRange.end() ? nullptr
                                                             : parentsRange.begin()->get<Stmt>();
     };
@@ -379,7 +379,7 @@ void ConstFields::check(const FieldDecl* fieldDecl, const Expr* memberExpr)
         {
             // check if we have an expression like
             //    int& r = m_field;
-            auto parentsRange = getParents(*child);
+            auto parentsRange = compiler.getASTContext().getParents(*child);
             if (parentsRange.begin() != parentsRange.end())
             {
                 auto varDecl = dyn_cast_or_null<VarDecl>(parentsRange.begin()->get<Decl>());
diff --git a/compilerplugins/clang/constmethod.cxx b/compilerplugins/clang/constmethod.cxx
index 93496148b458..45451152dc99 100644
--- a/compilerplugins/clang/constmethod.cxx
+++ b/compilerplugins/clang/constmethod.cxx
@@ -194,7 +194,7 @@ bool ConstMethod::checkIfCanBeConst(const Stmt* stmt, const CXXMethodDecl* cxxMe
 {
     const Stmt* parent = getParentStmt( stmt );
     if (!parent) {
-        auto parentsRange = getParents(*stmt);
+        auto parentsRange = compiler.getASTContext().getParents(*stmt);
         if ( parentsRange.begin() == parentsRange.end())
             return true;
         auto varDecl = dyn_cast_or_null<VarDecl>(parentsRange.begin()->get<Decl>());
diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx
index 8059495180a7..95c8184009d7 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -267,7 +267,7 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar
     if (!parent)
     {
         // check if we're inside a CXXCtorInitializer
-        auto parentsRange = getParents(*stmt);
+        auto parentsRange = compiler.getASTContext().getParents(*stmt);
         if ( parentsRange.begin() != parentsRange.end())
         {
             if (auto cxxConstructorDecl = dyn_cast_or_null<CXXConstructorDecl>(parentsRange.begin()->get<Decl>()))
diff --git a/compilerplugins/clang/constvars.cxx b/compilerplugins/clang/constvars.cxx
index 3c78bd458ffa..f89301fed205 100644
--- a/compilerplugins/clang/constvars.cxx
+++ b/compilerplugins/clang/constvars.cxx
@@ -304,7 +304,7 @@ bool ConstVars::VisitDeclRefExpr(const DeclRefExpr* declRefExpr)
 
 void ConstVars::check(const VarDecl* varDecl, const Expr* memberExpr)
 {
-    auto parentsRange = getParents(*memberExpr);
+    auto parentsRange = compiler.getASTContext().getParents(*memberExpr);
     const Stmt* child = memberExpr;
     const Stmt* parent
         = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
@@ -315,7 +315,7 @@ void ConstVars::check(const VarDecl* varDecl, const Expr* memberExpr)
     bool bDump = false;
     auto walkUp = [&]() {
         child = parent;
-        auto parentsRange = getParents(*parent);
+        auto parentsRange = compiler.getASTContext().getParents(*parent);
         parent = parentsRange.begin() == parentsRange.end() ? nullptr
                                                             : parentsRange.begin()->get<Stmt>();
     };
@@ -325,7 +325,7 @@ void ConstVars::check(const VarDecl* varDecl, const Expr* memberExpr)
         {
             // check if we have an expression like
             //    int& r = var;
-            auto parentsRange = getParents(*child);
+            auto parentsRange = compiler.getASTContext().getParents(*child);
             if (parentsRange.begin() != parentsRange.end())
             {
                 auto varDecl = dyn_cast_or_null<VarDecl>(parentsRange.begin()->get<Decl>());
@@ -334,7 +334,7 @@ void ConstVars::check(const VarDecl* varDecl, const Expr* memberExpr)
                     if (varDecl->isImplicit())
                     {
                         // so we can walk up from inside a for-range stmt
-                        parentsRange = getParents(*varDecl);
+                        parentsRange = compiler.getASTContext().getParents(*varDecl);
                         if (parentsRange.begin() != parentsRange.end())
                             parent = parentsRange.begin()->get<Stmt>();
                     }
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index dc7c673a31c3..4e640cfb2c3b 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -184,35 +184,9 @@ bool Plugin::evaluate(const Expr* expr, APSInt& x)
     return false;
 }
 
-compat::DynTypedNodeList Plugin::getParents(Decl const & decl)
-{
-#if CLANG_VERSION >= 110000
-    if (!parentMapContext_) {
-        parentMapContext_.reset(new ParentMapContext(compiler.getASTContext()));
-        parentMapContext_->setTraversalKind(TK_AsIs);
-    }
-    return parentMapContext_->getParents(decl);
-#else
-    return compiler.getASTContext().getParents(decl);
-#endif
-}
-
-compat::DynTypedNodeList Plugin::getParents(Stmt const & stmt)
-{
-#if CLANG_VERSION >= 110000
-    if (!parentMapContext_) {
-        parentMapContext_.reset(new ParentMapContext(compiler.getASTContext()));
-        parentMapContext_->setTraversalKind(TK_AsIs);
-    }
-    return parentMapContext_->getParents(stmt);
-#else
-    return compiler.getASTContext().getParents(stmt);
-#endif
-}
-
 const Stmt* Plugin::getParentStmt( const Stmt* stmt )
 {
-    auto parentsRange = getParents(*stmt);
+    auto parentsRange = compiler.getASTContext().getParents(*stmt);
     if ( parentsRange.begin() == parentsRange.end())
         return nullptr;
     return parentsRange.begin()->get<Stmt>();
@@ -220,15 +194,15 @@ const Stmt* Plugin::getParentStmt( const Stmt* stmt )
 
 Stmt* Plugin::getParentStmt( Stmt* stmt )
 {
-    auto parentsRange = getParents(*stmt);
+    auto parentsRange = compiler.getASTContext().getParents(*stmt);
     if ( parentsRange.begin() == parentsRange.end())
         return nullptr;
     return const_cast<Stmt*>(parentsRange.begin()->get<Stmt>());
 }
 
-const Decl* Plugin::getFunctionDeclContext(const Stmt* stmt)
+const Decl* getFunctionDeclContext(ASTContext& context, const Stmt* stmt)
 {
-    auto const parents = getParents(*stmt);
+    auto const parents = context.getParents(*stmt);
     auto it = parents.begin();
 
     if (it == parents.end())
@@ -244,14 +218,14 @@ const Decl* Plugin::getFunctionDeclContext(const Stmt* stmt)
 
     stmt = it->get<Stmt>();
     if (stmt)
-        return getFunctionDeclContext(stmt);
+        return getFunctionDeclContext(context, stmt);
 
     return nullptr;
 }
 
 const FunctionDecl* Plugin::getParentFunctionDecl( const Stmt* stmt )
 {
-    const Decl *decl = getFunctionDeclContext(stmt);
+    const Decl *decl = getFunctionDeclContext(compiler.getASTContext(), stmt);
     if (decl)
         return static_cast<const FunctionDecl*>(decl->getNonClosureContext());
 
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index 66d22adf97d6..577e8998b187 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -18,8 +18,6 @@
 #include <clang/Basic/SourceManager.h>
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Lex/Preprocessor.h>
-
-#include <memory>
 #include <unordered_map>
 #include <vector>
 
@@ -28,10 +26,6 @@
 #include "compat.hxx"
 #include "pluginhandler.hxx"
 
-#if CLANG_VERSION >= 110000
-#include "clang/AST/ParentMapContext.h"
-#endif
-
 using namespace clang;
 using namespace llvm;
 
@@ -84,11 +78,8 @@ protected:
      Returns the parent of the given AST node. Clang's internal AST representation doesn't provide this information,
      it can only provide children, but getting the parent is often useful for inspecting a part of the AST.
     */
-    compat::DynTypedNodeList getParents(Decl const & decl);
-    compat::DynTypedNodeList getParents(Stmt const & stmt);
     const Stmt* getParentStmt( const Stmt* stmt );
     Stmt* getParentStmt( Stmt* stmt );
-    const Decl* getFunctionDeclContext(const Stmt* stmt);
     const FunctionDecl* getParentFunctionDecl( const Stmt* stmt );
 
     /**
@@ -121,10 +112,6 @@ private:
 
     enum { isRewriter = false };
     const char* name;
-
-#if CLANG_VERSION >= 110000
-    std::unique_ptr<ParentMapContext> parentMapContext_;
-#endif
 };
 
 template<typename Derived>
@@ -321,6 +308,8 @@ bool hasExternalLinkage(VarDecl const * decl);
 
 bool isSmartPointerType(const Expr*);
 
+const Decl* getFunctionDeclContext(ASTContext& context, const Stmt* stmt);
+
 } // namespace
 
 #endif // COMPILEPLUGIN_H
diff --git a/compilerplugins/clang/singlevalfields.cxx b/compilerplugins/clang/singlevalfields.cxx
index 76902f22737f..ce60eeea7df0 100644
--- a/compilerplugins/clang/singlevalfields.cxx
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -315,7 +315,7 @@ void SingleValFields::walkPotentialAssign( const DeclaratorDecl* fieldOrVarDecl,
 
     while (!bPotentiallyAssignedTo) {
         // check for field being accessed by a reference variable e.g. Foo& f = m.foo;
-        auto parentsList = getParents(*child);
+        auto parentsList = compiler.getASTContext().getParents(*child);
         auto it = parentsList.begin();
         if (it != parentsList.end()) {
             const VarDecl *varDecl = it->get<VarDecl>();
diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx
index de879fc3476d..6bbb35930696 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -531,7 +531,7 @@ void UnusedFields::checkIfReadFrom(const FieldDecl* fieldDecl, const Expr* membe
             return;
     }
 
-    auto parentsRange = getParents(*memberExpr);
+    auto parentsRange = compiler.getASTContext().getParents(*memberExpr);
     const Stmt* child = memberExpr;
     const Stmt* parent = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
     // walk up the tree until we find something interesting
@@ -539,7 +539,7 @@ void UnusedFields::checkIfReadFrom(const FieldDecl* fieldDecl, const Expr* membe
     bool bDump = false;
     auto walkUp = [&]() {
        child = parent;
-       auto parentsRange = getParents(*parent);
+       auto parentsRange = compiler.getASTContext().getParents(*parent);
        parent = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
     };
     do
@@ -547,7 +547,7 @@ void UnusedFields::checkIfReadFrom(const FieldDecl* fieldDecl, const Expr* membe
         if (!parent)
         {
             // check if we're inside a CXXCtorInitializer or a VarDecl
-            auto parentsRange = getParents(*child);
+            auto parentsRange = compiler.getASTContext().getParents(*child);
             if ( parentsRange.begin() != parentsRange.end())
             {
                 const Decl* decl = parentsRange.begin()->get<Decl>();
@@ -779,7 +779,7 @@ void UnusedFields::checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memb
     if (std::find(insideConditionalCheckOfMemberSet.begin(), insideConditionalCheckOfMemberSet.end(), fieldDecl) != insideConditionalCheckOfMemberSet.end())
         return;
 
-    auto parentsRange = getParents(*memberExpr);
+    auto parentsRange = compiler.getASTContext().getParents(*memberExpr);
     const Stmt* child = memberExpr;
     const Stmt* parent = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
     // walk up the tree until we find something interesting
@@ -787,7 +787,7 @@ void UnusedFields::checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memb
     bool bDump = false;
     auto walkUp = [&]() {
        child = parent;
-       auto parentsRange = getParents(*parent);
+       auto parentsRange = compiler.getASTContext().getParents(*parent);
        parent = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
     };
     do
@@ -796,7 +796,7 @@ void UnusedFields::checkIfWrittenTo(const FieldDecl* fieldDecl, const Expr* memb
         {
             // check if we have an expression like
             //    int& r = m_field;
-            auto parentsRange = getParents(*child);
+            auto parentsRange = compiler.getASTContext().getParents(*child);
             if (parentsRange.begin() != parentsRange.end())
             {
                 auto varDecl = dyn_cast_or_null<VarDecl>(parentsRange.begin()->get<Decl>());
@@ -1157,7 +1157,7 @@ void UnusedFields::checkTouchedFromOutside(const FieldDecl* fieldDecl, const Exp
             if (memberExprParentFunction)
                 memberExprParentFunction->dump();
             memberExpr->dump();
-            const Decl *decl = getFunctionDeclContext(memberExpr);
+            const Decl *decl = loplugin::getFunctionDeclContext(compiler.getASTContext(), memberExpr);
             if (decl)
                 decl->dump();
             std::cout << "site1" << std::endl;
diff --git a/compilerplugins/clang/unusedvariablemore.cxx b/compilerplugins/clang/unusedvariablemore.cxx
index 484cab088843..b4394b31f8d6 100644
--- a/compilerplugins/clang/unusedvariablemore.cxx
+++ b/compilerplugins/clang/unusedvariablemore.cxx
@@ -204,7 +204,7 @@ bool UnusedVariableMore::checkifUnused(Stmt const* stmt, VarDecl const* varDecl)
     if (!parent)
     {
         // check if we're inside a CXXCtorInitializer
-        auto parentsRange = getParents(*stmt);
+        auto parentsRange = compiler.getASTContext().getParents(*stmt);
         if (parentsRange.begin() != parentsRange.end())
         {
             auto parentDecl = parentsRange.begin()->get<Decl>();
diff --git a/compilerplugins/clang/writeonlyvars.cxx b/compilerplugins/clang/writeonlyvars.cxx
index de8e77cc7610..6161b428557a 100644
--- a/compilerplugins/clang/writeonlyvars.cxx
+++ b/compilerplugins/clang/writeonlyvars.cxx
@@ -593,7 +593,7 @@ bool WriteOnlyVars::TraverseIfStmt(IfStmt* ifStmt)
 
 void WriteOnlyVars::checkIfReadFrom(const VarDecl* varDecl, const Expr* memberExpr)
 {
-    auto parentsRange = getParents(*memberExpr);
+    auto parentsRange = compiler.getASTContext().getParents(*memberExpr);
     const Stmt* child = memberExpr;
     const Stmt* parent
         = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
@@ -602,7 +602,7 @@ void WriteOnlyVars::checkIfReadFrom(const VarDecl* varDecl, const Expr* memberEx
     bool bDump = false;
     auto walkupUp = [&]() {
         child = parent;
-        auto parentsRange = getParents(*parent);
+        auto parentsRange = compiler.getASTContext().getParents(*parent);
         parent = parentsRange.begin() == parentsRange.end() ? nullptr
                                                             : parentsRange.begin()->get<Stmt>();
     };
@@ -611,7 +611,7 @@ void WriteOnlyVars::checkIfReadFrom(const VarDecl* varDecl, const Expr* memberEx
         if (!parent)
         {
             // check if we're inside a CXXCtorInitializer or a VarDecl
-            auto parentsRange = getParents(*child);
+            auto parentsRange = compiler.getASTContext().getParents(*child);
             if (parentsRange.begin() != parentsRange.end())
             {
                 const Decl* decl = parentsRange.begin()->get<Decl>();
@@ -810,7 +810,7 @@ void WriteOnlyVars::checkIfWrittenTo(const VarDecl* varDecl, const Expr* memberE
         != insideConditionalCheckOfMemberSet.end())
         return;
 
-    auto parentsRange = getParents(*memberExpr);
+    auto parentsRange = compiler.getASTContext().getParents(*memberExpr);
     const Stmt* child = memberExpr;
     const Stmt* parent
         = parentsRange.begin() == parentsRange.end() ? nullptr : parentsRange.begin()->get<Stmt>();
@@ -819,7 +819,7 @@ void WriteOnlyVars::checkIfWrittenTo(const VarDecl* varDecl, const Expr* memberE
     bool bDump = false;
     auto walkupUp = [&]() {
         child = parent;
-        auto parentsRange = getParents(*parent);
+        auto parentsRange = compiler.getASTContext().getParents(*parent);
         parent = parentsRange.begin() == parentsRange.end() ? nullptr
                                                             : parentsRange.begin()->get<Stmt>();
     };
@@ -829,7 +829,7 @@ void WriteOnlyVars::checkIfWrittenTo(const VarDecl* varDecl, const Expr* memberE
         {
             // check if we have an expression like
             //    int& r = var;
-            auto parentsRange = getParents(*child);
+            auto parentsRange = compiler.getASTContext().getParents(*child);
             if (parentsRange.begin() != parentsRange.end())
             {
                 auto varDecl = dyn_cast_or_null<VarDecl>(parentsRange.begin()->get<Decl>());