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

[Stephan Bergmann]

 compilerplugins/clang/casttovoid.cxx      |    3 +++
 compilerplugins/clang/test/casttovoid.cxx |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit aab0322580c87864a4f0c0af1fed07282c8dccbb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Dec 30 17:50:49 2017 +0100

    Disable loplugin:casttovoid when --disable-assert-always-abort
    
    ...as finding uses of variables in arguments to expand-to-nothing assert macros
    is just not implemented not implemented.
    
    Change-Id: Iacb3bd25d03eca13ac8ff3942f98e46dee3286b9
    Reviewed-on: https://gerrit.libreoffice.org/47200
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/casttovoid.cxx b/compilerplugins/clang/casttovoid.cxx
index e98388c8de7b..c67d7ca10870 100644
--- a/compilerplugins/clang/casttovoid.cxx
+++ b/compilerplugins/clang/casttovoid.cxx
@@ -336,6 +336,9 @@ private:
     std::stack<QualType> returnTypes_;
 
     void run() override {
+        if (compiler.getPreprocessor().getIdentifierInfo("NDEBUG")->hasMacroDefinition()) {
+            return;
+        }
         if (!TraverseDecl(compiler.getASTContext().getTranslationUnitDecl())) {
             return;
         }
diff --git a/compilerplugins/clang/test/casttovoid.cxx b/compilerplugins/clang/test/casttovoid.cxx
index edd538690224..e82118259df9 100644
--- a/compilerplugins/clang/test/casttovoid.cxx
+++ b/compilerplugins/clang/test/casttovoid.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#undef NDEBUG
 #include <cassert>
 
 #define CAST_N3 (void) n3