Add loplugin:consttobool assert-related tests

...and improve diagnostics a bit

Change-Id: I3233aa1752620ddbe6fbeff93b15565921f0bc2e
Reviewed-on: https://gerrit.libreoffice.org/82767
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

2 files changed, 16 insertions, 0 deletions

diff --git a/compilerplugins/clang/consttobool.cxx b/compilerplugins/clang/consttobool.cxx
index 8f7823aa8816..21fde3f547b1 100644
--- a/compilerplugins/clang/consttobool.cxx
+++ b/compilerplugins/clang/consttobool.cxx
@@ -207,6 +207,11 @@ public:
             suggestion = true;
             replacement = false;
         }
+        else if (res.isLValue())
+        {
+            suggestion = true;
+            replacement = true;
+        }
         else
         {
             suggestion = false;
diff --git a/compilerplugins/clang/test/consttobool.cxx b/compilerplugins/clang/test/consttobool.cxx
index 6110b4ba0942..684a9739b2ab 100644
--- a/compilerplugins/clang/test/consttobool.cxx
+++ b/compilerplugins/clang/test/consttobool.cxx
@@ -9,6 +9,8 @@
 
 #include <sal/config.h>
 
+#include <cassert>
+
 #include <sal/types.h>
 
 #pragma clang diagnostic ignored "-Wnull-conversion"
@@ -44,6 +46,15 @@ int main()
     b = c2;
     // expected-error@+1 {{implicit conversion of constant 3 of type 'int' to 'bool'; use 'true' instead [loplugin:consttobool]}}
     b = (c1 | c2);
+
+    assert(b); // no warnings from within assert macro itself
+    assert(b && "msg"); // no warnings for `&& "msg"`
+    if (b)
+    {
+        assert(!"msg"); // no warnings for `!"msg"`
+    }
+    // expected-error@+1 {{implicit conversion of constant &"msg"[0] of type 'const char *' to 'bool'; use 'true' instead [loplugin:consttobool]}}
+    assert("msg");
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */