[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/check.cxx              |    5 ++---
 compilerplugins/clang/logexceptionnicely.cxx |    3 +--
 compilerplugins/clang/sfxpoolitem.cxx        |    4 ++--
 compilerplugins/clang/simplifybool.cxx       |    2 +-
 compilerplugins/clang/staticmethods.cxx      |    2 +-
 compilerplugins/clang/vclwidgets.cxx         |    2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 4ba1088d68fc7c0c76e13f29faff5a3f54342534
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Mar 1 20:09:44 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Mar 2 07:51:34 2020 +0100

    Adapt compilerplugins to Clang trunk change
    
    <https://github.com/llvm/llvm-project/commit/
    93184a8eda272c65308906836b47cbf209de779e> "Remove unused parameter from
    CXXRecordDecl::forallBases [NFC]"
    
    Change-Id: I8efdda2a37fd0df3b964401e8851a0f95f8d0ab4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89781
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/check.cxx b/compilerplugins/clang/check.cxx
index 472e296907b0..b4317c07bcf7 100644
--- a/compilerplugins/clang/check.cxx
+++ b/compilerplugins/clang/check.cxx
@@ -239,7 +239,7 @@ bool isDerivedFromSomethingInteresting(const clang::CXXRecordDecl *decl) {
     if (// not sure what hasAnyDependentBases() does,
         // but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1
         !decl->hasAnyDependentBases() &&
-        !decl->forallBases(BaseCheckNotSomethingInterestingSubclass, true)) {
+        !decl->forallBases(BaseCheckNotSomethingInterestingSubclass)) {
         return true;
     }
     return false;
@@ -357,8 +357,7 @@ bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base) {
     }
     if (!decl->forallBases(
             [&base](const clang::CXXRecordDecl *BaseDefinition) -> bool
-                { return BaseCheckNotSubclass(BaseDefinition, &base); },
-            true))
+                { return BaseCheckNotSubclass(BaseDefinition, &base); }))
     {
         return true;
     }
diff --git a/compilerplugins/clang/logexceptionnicely.cxx b/compilerplugins/clang/logexceptionnicely.cxx
index 86f6406a7c3b..a262d276b88c 100644
--- a/compilerplugins/clang/logexceptionnicely.cxx
+++ b/compilerplugins/clang/logexceptionnicely.cxx
@@ -88,8 +88,7 @@ public:
             return true;
         if ( // not sure what hasAnyDependentBases() does,
             // but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1
-            !decl->hasAnyDependentBases()
-            && !decl->forallBases(BaseCheckNotExceptionSubclass, true))
+            !decl->hasAnyDependentBases() && !decl->forallBases(BaseCheckNotExceptionSubclass))
         {
             return true;
         }
diff --git a/compilerplugins/clang/sfxpoolitem.cxx b/compilerplugins/clang/sfxpoolitem.cxx
index ce52336c8e04..31d7dbc13c24 100644
--- a/compilerplugins/clang/sfxpoolitem.cxx
+++ b/compilerplugins/clang/sfxpoolitem.cxx
@@ -52,7 +52,7 @@ bool isDerivedFromSfxPoolItem(const CXXRecordDecl *decl) {
     if (// not sure what hasAnyDependentBases() does,
         // but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1
         !decl->hasAnyDependentBases() &&
-        !decl->forallBases(BaseCheckNotSfxPoolItemSubclass, true)) {
+        !decl->forallBases(BaseCheckNotSfxPoolItemSubclass)) {
         return true;
     }
     return false;
@@ -77,7 +77,7 @@ bool isDerivedFromSwMsgPoolItem(const CXXRecordDecl *decl) {
     if (// not sure what hasAnyDependentBases() does,
         // but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1
         !decl->hasAnyDependentBases() &&
-        !decl->forallBases(BaseCheckNotSwMsgPoolItemSubclass, true)) {
+        !decl->forallBases(BaseCheckNotSwMsgPoolItemSubclass)) {
         return true;
     }
     return false;
diff --git a/compilerplugins/clang/simplifybool.cxx b/compilerplugins/clang/simplifybool.cxx
index b1cd6b8c2abd..6541cf01ba8b 100644
--- a/compilerplugins/clang/simplifybool.cxx
+++ b/compilerplugins/clang/simplifybool.cxx
@@ -133,7 +133,7 @@ FunctionDecl const * findOperator(CompilerInstance& compiler, BinaryOperator::Op
         return false;
     };
 
-    lhsRecordDecl->forallBases(ForallBasesCallback, /*AllowShortCircuit*/true);
+    lhsRecordDecl->forallBases(ForallBasesCallback);
     if (foundFunction)
         return foundFunction;
 
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index 6070ce860d82..1b78d06f6c02 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -51,7 +51,7 @@ bool isDerivedFromTestFixture(const CXXRecordDecl *decl) {
     if (// not sure what hasAnyDependentBases() does,
         // but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1
         !decl->hasAnyDependentBases() &&
-        !decl->forallBases(BaseCheckNotTestFixtureSubclass, true)) {
+        !decl->forallBases(BaseCheckNotTestFixtureSubclass)) {
         return true;
     }
     return false;
diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx
index 9d37b5ce9153..305defbf014e 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -73,7 +73,7 @@ bool isDerivedFromVclReferenceBase(const CXXRecordDecl *decl) {
     if (// not sure what hasAnyDependentBases() does,
         // but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1
         !decl->hasAnyDependentBases() &&
-        !decl->forallBases(BaseCheckNotWindowSubclass, true)) {
+        !decl->forallBases(BaseCheckNotWindowSubclass)) {
         return true;
     }
     return false;