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

loplugin:external: Check for DLLExportAttr also in VisitTagDecl

Browse Source 
...to fix false clang-cl warnings like

> C:/lo-clang/core/cppuhelper/source/compat.cxx(113,29): error: externally available entity 'ClassData' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]
> struct SAL_DLLPUBLIC_EXPORT ClassData {
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~

Change-Id: Iacf96569e27772aa9e27221619516b1fb84dd665
Reviewed-on: https://gerrit.libreoffice.org/84514
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-12-05 09:51:05 +01:00
parent 55eddbecb3
commit c9a6d4bee7
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
compilerplugins/clang/external.cxx
View File

@@ -121,6 +121,15 @@ bool mentions(QualType type1, QualType type2)
return false; return false;
} }
bool hasSalDllpublicExportAttr(Decl const* decl)
{
if (auto const attr = decl->getAttr<VisibilityAttr>())
{
return attr->getVisibility() == VisibilityAttr::Default;
}
return decl->hasAttr<DLLExportAttr>();
}
class External : public loplugin::FilteringPlugin<External> class External : public loplugin::FilteringPlugin<External>
{ {
public: public:
@@ -155,15 +164,12 @@ public:
{ {
return true; return true;
} }
if (auto const attr = d->getAttr<VisibilityAttr>()) if (hasSalDllpublicExportAttr(d))
{ {
if (attr->getVisibility() == VisibilityAttr::Default) // If the class definition has explicit default visibility, then assume that it
{ // needs to be present (e.g., a backwards-compatibility stub like in
// If the class definition has explicit default visibility, then assume that it // cppuhelper/source/compat.cxx):
// needs to be present (e.g., a backwards-compatibility stub like in return true;
// cppuhelper/source/compat.cxx):
return true;
}
} }
if (derivesFromTestFixture(d)) if (derivesFromTestFixture(d))
{ {
@@ -202,14 +208,7 @@ public:
// If the function definition is explicit marked SAL_DLLPUBLIC_EXPORT or similar, then // If the function definition is explicit marked SAL_DLLPUBLIC_EXPORT or similar, then
// assume that it needs to be present (e.g., only called via dlopen, or a backwards- // assume that it needs to be present (e.g., only called via dlopen, or a backwards-
// compatibility stub like in sal/osl/all/compat.cxx): // compatibility stub like in sal/osl/all/compat.cxx):
if (auto const attr = decl->getAttr<VisibilityAttr>()) if (hasSalDllpublicExportAttr(decl))
{
if (attr->getVisibility() == VisibilityAttr::Default)
{
return true;
}
}
else if (decl->hasAttr<DLLExportAttr>())
{ {
return true; return true;
} }