mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid getQualifiedNameAsString

Browse Source 
Change-Id: I448bfd63f1a2fb9cac3366146b10ff6a465e6db7
This commit is contained in:
Stephan Bergmann 2017-06-30 11:16:03 +02:00
parent c724093edb
commit 09031ef2fe
3 changed files with 63 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compilerplugins/clang/check.hxx
View File

@ -88,6 +88,9 @@ public:
template<std::size_t N> inline ContextCheck Struct(char const (& id)[N]) template<std::size_t N> inline ContextCheck Struct(char const (& id)[N])
const; const;
template<std::size_t N> inline ContextCheck Union(char const (& id)[N])
const;
template<std::size_t N> inline ContextCheck Function(char const (& id)[N]) template<std::size_t N> inline ContextCheck Function(char const (& id)[N])
const; const;
@ -215,6 +218,12 @@ template<std::size_t N> ContextCheck DeclCheck::Struct(char const (& id)[N])
return detail::checkRecordDecl(decl_, clang::TTK_Struct, id); return detail::checkRecordDecl(decl_, clang::TTK_Struct, id);
} }
template<std::size_t N> ContextCheck DeclCheck::Union(char const (& id)[N])
const
{
return detail::checkRecordDecl(decl_, clang::TTK_Union, id);
}
template<std::size_t N> ContextCheck DeclCheck::Function(char const (& id)[N]) template<std::size_t N> ContextCheck DeclCheck::Function(char const (& id)[N])
const const
{ {

88
compilerplugins/clang/refcounting.cxx
View File

@ -69,25 +69,27 @@ public:
} }
private: private:
void checkUnoReference(QualType qt, const Decl* decl, void checkUnoReference(QualType qt, const Decl* decl,
const std::string& rParentName, const std::string& rDeclName); const DeclContext* parent, const std::string& rDeclName);
bool visitTemporaryObjectExpr(Expr const * expr); bool visitTemporaryObjectExpr(Expr const * expr);
}; };
typedef std::function<bool(Decl const *)> DeclChecker;
bool BaseCheckNotSubclass(const CXXRecordDecl *BaseDefinition, void *p) { bool BaseCheckNotSubclass(const CXXRecordDecl *BaseDefinition, void *p) {
if (!BaseDefinition) if (!BaseDefinition)
return true; return true;
const char *pString = static_cast<const char *>(p); auto const & base = *static_cast<const DeclChecker *>(p);
if (BaseDefinition->getQualifiedNameAsString() == pString) { if (base(BaseDefinition)) {
return false; return false;
} }
return true; return true;
} }
bool isDerivedFrom(const CXXRecordDecl *decl, const char *pString) { bool isDerivedFrom(const CXXRecordDecl *decl, DeclChecker base) {
if (!decl) if (!decl)
return false; return false;
if (decl->getQualifiedNameAsString() == pString) if (base(decl))
return true; return true;
if (!decl->hasDefinition()) { if (!decl->hasDefinition()) {
return false; return false;
@ -97,11 +99,10 @@ bool isDerivedFrom(const CXXRecordDecl *decl, const char *pString) {
#if CLANG_VERSION < 30800 #if CLANG_VERSION < 30800
BaseCheckNotSubclass, BaseCheckNotSubclass,
#else #else
[pString](const CXXRecordDecl *BaseDefinition) -> bool [&base](const CXXRecordDecl *BaseDefinition) -> bool
{ return BaseCheckNotSubclass( { return BaseCheckNotSubclass(BaseDefinition, &base); },
BaseDefinition, const_cast<char *>(pString)); },
#endif #endif
static_cast<void*>(const_cast<char*>(pString)), true)) &base, true))
{ {
return true; return true;
} }
@ -125,25 +126,25 @@ bool containsXInterfaceSubclass(const Type* pType0) {
if (pRecordDecl) { if (pRecordDecl) {
pRecordDecl = pRecordDecl->getCanonicalDecl(); pRecordDecl = pRecordDecl->getCanonicalDecl();
// these classes override acquire/release and forwards to its parent // these classes override acquire/release and forwards to its parent
if (isDerivedFrom(pRecordDecl, "ListenerMultiplexerBase")) { // module UnoTools if (isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("ListenerMultiplexerBase").GlobalNamespace()); })) { // module UnoTools
return false; return false;
} }
if (isDerivedFrom(pRecordDecl, "toolkit::GridEventForwarder")) { // module toolkit if (isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("GridEventForwarder").Namespace("toolkit").GlobalNamespace()); })) { // module toolkit
return false; return false;
} }
if (isDerivedFrom(pRecordDecl, "OWeakSubObject")) { // module svx if (isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("OWeakSubObject").GlobalNamespace()); })) { // module svx
return false; return false;
} }
if (isDerivedFrom(pRecordDecl, "dbaui::OSbaWeakSubObject")) { // module dbaccess if (isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("OSbaWeakSubObject").Namespace("dbaui").GlobalNamespace()); })) { // module dbaccess
return false; return false;
} }
// The actual problem child is SlideView, of which this is the parent. // The actual problem child is SlideView, of which this is the parent.
// Everything in the hierarchy above this wants to be managed via boost::shared_ptr // Everything in the hierarchy above this wants to be managed via boost::shared_ptr
if (isDerivedFrom(pRecordDecl, "slideshow::internal::UnoView")) { // module slideshow if (isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("UnoView").Namespace("internal").Namespace("slideshow").GlobalNamespace()); })) { // module slideshow
return false; return false;
} }
// FIXME This class has private operator new, and I cannot figure out how it can be dynamically instantiated // FIXME This class has private operator new, and I cannot figure out how it can be dynamically instantiated
if (isDerivedFrom(pRecordDecl, "XPropertyList")) { // module svx if (isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("XPropertyList").GlobalNamespace()); })) { // module svx
return false; return false;
} }
} }
@ -232,7 +233,7 @@ bool containsXInterfaceSubclass(const Type* pType0) {
QualType elementType = pArrayType->getElementType(); QualType elementType = pArrayType->getElementType();
return containsXInterfaceSubclass(elementType); return containsXInterfaceSubclass(elementType);
} else { } else {
return isDerivedFrom(pRecordDecl, "com::sun::star::uno::XInterface"); return isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("XInterface").Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace()); });
} }
} }
@ -249,9 +250,11 @@ bool containsSvRefBaseSubclass(const Type* pType0) {
if (pRecordDecl) { if (pRecordDecl) {
const ClassTemplateSpecializationDecl* pTemplate = dyn_cast<ClassTemplateSpecializationDecl>(pRecordDecl); const ClassTemplateSpecializationDecl* pTemplate = dyn_cast<ClassTemplateSpecializationDecl>(pRecordDecl);
if (pTemplate) { if (pTemplate) {
std::string aName = pTemplate->getQualifiedNameAsString(); if (loplugin::DeclCheck(pTemplate).Class("SvRef")
if (aName == "tools::SvRef") .Namespace("tools").GlobalNamespace())
{
return false; return false;
}
for(unsigned i=0; i<pTemplate->getTemplateArgs().size(); ++i) { for(unsigned i=0; i<pTemplate->getTemplateArgs().size(); ++i) {
const TemplateArgument& rArg = pTemplate->getTemplateArgs()[i]; const TemplateArgument& rArg = pTemplate->getTemplateArgs()[i];
if (rArg.getKind() == TemplateArgument::ArgKind::Type && if (rArg.getKind() == TemplateArgument::ArgKind::Type &&
@ -270,7 +273,7 @@ bool containsSvRefBaseSubclass(const Type* pType0) {
QualType elementType = pArrayType->getElementType(); QualType elementType = pArrayType->getElementType();
return containsSvRefBaseSubclass(elementType.getTypePtr()); return containsSvRefBaseSubclass(elementType.getTypePtr());
} else { } else {
return isDerivedFrom(pRecordDecl, "tools::SvRefBase"); return isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("SvRefBase").Namespace("tools").GlobalNamespace()); });
} }
} }
@ -287,9 +290,13 @@ bool containsSalhelperReferenceObjectSubclass(const Type* pType0) {
if (pRecordDecl) { if (pRecordDecl) {
const ClassTemplateSpecializationDecl* pTemplate = dyn_cast<ClassTemplateSpecializationDecl>(pRecordDecl); const ClassTemplateSpecializationDecl* pTemplate = dyn_cast<ClassTemplateSpecializationDecl>(pRecordDecl);
if (pTemplate) { if (pTemplate) {
std::string aName = pTemplate->getQualifiedNameAsString(); auto const dc = loplugin::DeclCheck(pTemplate);
if (aName == "rtl::Reference" || aName == "store::OStoreHandle") if (dc.Class("Reference").Namespace("rtl").GlobalNamespace()
|| (dc.Class("OStoreHandle").Namespace("store")
.GlobalNamespace()))
{
return false; return false;
}
for(unsigned i=0; i<pTemplate->getTemplateArgs().size(); ++i) { for(unsigned i=0; i<pTemplate->getTemplateArgs().size(); ++i) {
const TemplateArgument& rArg = pTemplate->getTemplateArgs()[i]; const TemplateArgument& rArg = pTemplate->getTemplateArgs()[i];
if (rArg.getKind() == TemplateArgument::ArgKind::Type && if (rArg.getKind() == TemplateArgument::ArgKind::Type &&
@ -308,7 +315,7 @@ bool containsSalhelperReferenceObjectSubclass(const Type* pType0) {
QualType elementType = pArrayType->getElementType(); QualType elementType = pArrayType->getElementType();
return containsSalhelperReferenceObjectSubclass(elementType.getTypePtr()); return containsSalhelperReferenceObjectSubclass(elementType.getTypePtr());
} else { } else {
return isDerivedFrom(pRecordDecl, "salhelper::SimpleReferenceObject"); return isDerivedFrom(pRecordDecl, [](Decl const * decl) -> bool { return bool(loplugin::DeclCheck(decl).Class("SimpleReferenceObject").Namespace("salhelper").GlobalNamespace()); });
} }
} }
@ -326,7 +333,7 @@ static bool containsStaticTypeMethod(const CXXRecordDecl* x)
return false; return false;
} }
void RefCounting::checkUnoReference(QualType qt, const Decl* decl, const std::string& rParentName, const std::string& rDeclName) void RefCounting::checkUnoReference(QualType qt, const Decl* decl, const DeclContext* parent, const std::string& rDeclName)
{ {
if (loplugin::TypeCheck(qt).Class("Reference").Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace()) { if (loplugin::TypeCheck(qt).Class("Reference").Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace()) {
const CXXRecordDecl* pRecordDecl = qt->getAsCXXRecordDecl(); const CXXRecordDecl* pRecordDecl = qt->getAsCXXRecordDecl();
@ -336,11 +343,11 @@ void RefCounting::checkUnoReference(QualType qt, const Decl* decl, const std::st
if (templateParam && !containsStaticTypeMethod(templateParam)) { if (templateParam && !containsStaticTypeMethod(templateParam)) {
report( report(
DiagnosticsEngine::Warning, DiagnosticsEngine::Warning,
"uno::Reference " + rDeclName + " with template parameter that does not contain ::static_type() " ("uno::Reference %0 with template parameter that does not"
+ qt.getAsString() " contain ::static_type() %1%select{|, parent is %3,}2 should"
+ ", parent is " + rParentName " probably be using rtl::Reference instead"),
+ ", should probably be using rtl::Reference instead",
decl->getLocation()) decl->getLocation())
<< rDeclName << qt << (parent != nullptr) << parent
<< decl->getSourceRange(); << decl->getSourceRange();
} }
} }
@ -389,10 +396,10 @@ bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
// check for dodgy code managing ref-counted stuff with shared_ptr or unique_ptr or similar stuff // check for dodgy code managing ref-counted stuff with shared_ptr or unique_ptr or similar stuff
QualType firstTemplateParamType; QualType firstTemplateParamType;
if (auto recordType = fieldDecl->getType()->getUnqualifiedDesugaredType()->getAs<RecordType>()) { if (auto recordType = fieldDecl->getType()->getUnqualifiedDesugaredType()->getAs<RecordType>()) {
auto recordDeclName = recordType->getDecl()->getName(); auto const tc = loplugin::TypeCheck(fieldDecl->getType());
if (recordDeclName.find("unique_ptr") != StringRef::npos if (tc.Class("unique_ptr").StdNamespace()
|| recordDeclName.find("shared_ptr") != StringRef::npos || tc.Class("shared_ptr").StdNamespace()
|| recordDeclName.find("intrusive_ptr") != StringRef::npos) // boost || tc.Class("intrusive_ptr").Namespace("boost").GlobalNamespace())
{ {
auto templateDecl = dyn_cast<ClassTemplateSpecializationDecl>(recordType->getDecl()); auto templateDecl = dyn_cast<ClassTemplateSpecializationDecl>(recordType->getDecl());
if (templateDecl && templateDecl->getTemplateArgs().size() > 0) if (templateDecl && templateDecl->getTemplateArgs().size() > 0)
@ -446,11 +453,14 @@ bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
<< fieldDecl->getSourceRange(); << fieldDecl->getSourceRange();
} }
std::string aParentName = fieldDecl->getParent()->getQualifiedNameAsString(); auto const dc = loplugin::DeclCheck(fieldDecl->getParent());
if ( aParentName == "com::sun::star::uno::BaseReference" if ( (dc.Class("BaseReference").Namespace("uno").Namespace("star")
|| aParentName == "cppu::detail::element_alias" .Namespace("sun").Namespace("com").GlobalNamespace())
|| (dc.Union("element_alias").Namespace("detail").Namespace("cppu")
.GlobalNamespace())
// this is playing some kind of game to avoid circular references // this is playing some kind of game to avoid circular references
|| aParentName == "ucbhelper::ResultSetDataSupplier") || (dc.Class("ResultSetDataSupplier").Namespace("ucbhelper")
.GlobalNamespace()))
{ {
return true; return true;
} }
@ -478,7 +488,9 @@ bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
<< fieldDecl->getSourceRange(); << fieldDecl->getSourceRange();
} }
checkUnoReference(fieldDecl->getType(), fieldDecl, aParentName, "field"); checkUnoReference(
fieldDecl->getType(), fieldDecl,
fieldDecl->getParent(), "field");
return true; return true;
} }
@ -518,7 +530,7 @@ bool RefCounting::VisitVarDecl(const VarDecl * varDecl) {
<< varDecl->getSourceRange(); << varDecl->getSourceRange();
} }
} }
checkUnoReference(varDecl->getType(), varDecl, "", "var"); checkUnoReference(varDecl->getType(), varDecl, nullptr, "var");
return true; return true;
} }
@ -532,7 +544,7 @@ bool RefCounting::VisitFunctionDecl(const FunctionDecl * functionDecl) {
if (methodDecl && methodDecl->size_overridden_methods() > 0) { if (methodDecl && methodDecl->size_overridden_methods() > 0) {
return true; return true;
} }
checkUnoReference(compat::getReturnType(*functionDecl), functionDecl, "", "return"); checkUnoReference(compat::getReturnType(*functionDecl), functionDecl, nullptr, "return");
return true; return true;
} }

4
compilerplugins/clang/test/refcounting.cxx
View File

@ -7,13 +7,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <sal/config.h>
#include <memory> #include <memory>
#include <boost/intrusive_ptr.hpp>
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
struct Foo struct Foo
{ {
std::unique_ptr<css::uno::XInterface> m_foo1; // expected-error {{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart pointer, should be managed via uno::Reference, parent is 'Foo' [loplugin:refcounting]}} std::unique_ptr<css::uno::XInterface> m_foo1; // expected-error {{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart pointer, should be managed via uno::Reference, parent is 'Foo' [loplugin:refcounting]}}
std::shared_ptr<css::uno::XInterface> m_foo2; // expected-error {{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart pointer, should be managed via uno::Reference, parent is 'Foo' [loplugin:refcounting]}} std::shared_ptr<css::uno::XInterface> m_foo2; // expected-error {{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart pointer, should be managed via uno::Reference, parent is 'Foo' [loplugin:refcounting]}}
boost::intrusive_ptr<css::uno::XInterface> m_foo3; // expected-error {{XInterface subclass 'com::sun::star::uno::XInterface' being managed via smart pointer, should be managed via uno::Reference, parent is 'Foo' [loplugin:refcounting]}}
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */