compilerplugins/clang/badstatics.cxx | 13 +++--- compilerplugins/clang/test/badstatics.cxx | 58 +++++++++++++++++++++++++++ solenv/CompilerTest_compilerplugins_clang.mk | 1 3 files changed, 67 insertions(+), 5 deletions(-)
New commits: commit 0fbfdce3eab680eb845af0d9cdb1d2352a5cbd28 Author: Michael Stahl <mst...@redhat.com> Date: Thu Sep 21 16:37:40 2017 +0200 compilerplugins: add test for badstatics Change-Id: Ibdb3144c0510ed723a01ca28d7cdcd6b21caec54 Reviewed-on: https://gerrit.libreoffice.org/42596 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index 56f2b7be9f91..9ada7b60459c 100644 --- a/compilerplugins/clang/badstatics.cxx +++ b/compilerplugins/clang/badstatics.cxx @@ -225,11 +225,14 @@ public: "bad static variable causes crash on shutdown", pVarDecl->getLocation()) << pVarDecl->getSourceRange(); - for (auto i: ret.second) { - report(DiagnosticsEngine::Note, - "... due to this member of %0", - i->getLocation()) - << i->getParent() << i->getSourceRange(); + if (!isUnitTestMode()) + { + for (auto i: ret.second) { + report(DiagnosticsEngine::Note, + "... due to this member of %0", + i->getLocation()) + << i->getParent() << i->getSourceRange(); + } } } } diff --git a/compilerplugins/clang/test/badstatics.cxx b/compilerplugins/clang/test/badstatics.cxx new file mode 100644 index 000000000000..db9a023d95a6 --- /dev/null +++ b/compilerplugins/clang/test/badstatics.cxx @@ -0,0 +1,58 @@ +/* -*- 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 <vector> +#include <map> +#include <cstdlib> + +class Image { public: ~Image() { ::std::abort(); } }; +class Bitmap { public: ~Bitmap() { ::std::abort(); } }; + +struct WithImage +{ + Image image; +}; + +struct WithBitmap +{ + Bitmap bitmap; +}; + +WithImage g_bug1; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} +WithBitmap g_bug2; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +static WithImage g_bug3; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +void foo() { + static Image s_bug1; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + Image nobug; +} + +::std::unique_ptr<WithImage> g_bug4; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +::std::shared_ptr<WithImage> g_bug5; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +::std::weak_ptr<WithImage> g_nobug; + +struct DerivedWithImage : WithImage +{ +}; + +DerivedWithImage g_bug6; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +::std::vector<Image> g_bug7; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +::std::vector<::std::unique_ptr<Image>> g_bug8; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +::std::map<Image, int> g_bug9; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +::std::map<int, Image> g_bug10; // expected-error {{bad static variable causes crash on shutdown [loplugin:badstatics]}} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/solenv/CompilerTest_compilerplugins_clang.mk b/solenv/CompilerTest_compilerplugins_clang.mk index f0c53ed3095a..4a6928a72348 100644 --- a/solenv/CompilerTest_compilerplugins_clang.mk +++ b/solenv/CompilerTest_compilerplugins_clang.mk @@ -10,6 +10,7 @@ $(eval $(call gb_CompilerTest_CompilerTest,compilerplugins_clang)) $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \ + compilerplugins/clang/test/badstatics \ compilerplugins/clang/test/casttovoid \ compilerplugins/clang/test/constparams \ $(if $(filter-out INTEL,$(CPU)),compilerplugins/clang/test/convertuintptr) \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits