Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 74 insertions, 0 deletions

diff --git a/compilerplugins/clang/test/simplifypointertobool.cxx b/compilerplugins/clang/test/simplifypointertobool.cxx
new file mode 100644
index 000000000..2980003e1
--- /dev/null
+++ b/compilerplugins/clang/test/simplifypointertobool.cxx
@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <memory>
+#include "com/sun/star/uno/XInterface.hpp"
+
+void foo();
+
+bool test1(std::unique_ptr<int> p2)
+{
+    // expected-error@+1 {{simplify, drop the get() [loplugin:simplifypointertobool]}}
+    if (p2.get())
+        foo();
+    // expected-error@+1 {{simplify, drop the get() and wrap the expression in a functional cast to bool [loplugin:simplifypointertobool]}}
+    bool b1 = p2.get();
+    // expected-error@+3 {{simplify, drop the get() and turn the surrounding parentheses into a functional cast to bool [loplugin:simplifypointertobool]}}
+    // expected-note@+1 {{surrounding parentheses here [loplugin:simplifypointertobool]}}
+    bool b2 = ( // deliberately spread across multiple lines
+        p2.get());
+    return b1 && b2;
+}
+
+void test2(std::shared_ptr<int> p)
+{
+    // expected-error@+1 {{simplify, drop the get() [loplugin:simplifypointertobool]}}
+    if (p.get())
+        foo();
+    // expected-error@+1 {{simplify, convert to '!x' [loplugin:simplifypointertobool]}}
+    if (p.get() == nullptr)
+        foo();
+    // TODOexpected-error@+1 {{simplify, convert to '!x' [loplugin:simplifypointertobool]}}
+    if (p == nullptr)
+        foo();
+    // TODOexpected-error@+1 {{simplify, convert to 'x' [loplugin:simplifypointertobool]}}
+    if (p != nullptr)
+        foo();
+    // expected-error@+1 {{simplify, convert to '!x' [loplugin:simplifypointertobool]}}
+    if (nullptr == p.get())
+        foo();
+    // expected-error@+1 {{simplify, convert to 'x' [loplugin:simplifypointertobool]}}
+    if (p.get() != nullptr)
+        foo();
+    // expected-error@+1 {{simplify, convert to 'x' [loplugin:simplifypointertobool]}}
+    if (nullptr != p.get())
+        foo();
+}
+
+void test2(int* p)
+{
+    // TODOexpected-error@+1 {{simplify, convert to '!x' [loplugin:simplifypointertobool]}}
+    if (p == nullptr)
+        foo();
+    // TODOexpected-error@+1 {{simplify, convert to 'x' [loplugin:simplifypointertobool]}}
+    if (p != nullptr)
+        foo();
+}
+
+void test2(css::uno::Reference<css::uno::XInterface> const& p)
+{
+    // expected-error@+1 {{simplify, drop the get() [loplugin:simplifypointertobool]}}
+    if (p.get())
+        foo();
+    // expected-error@+1 {{simplify, convert to '!x' [loplugin:simplifypointertobool]}}
+    if (p.get() == nullptr)
+        foo();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */