ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Fix implementation of loplugin::isDerivedFrom

Browse Source 
...where clang::CXXRecordDecl::forallBases is documented as:  "This routine
returns false if the class has non-computable base classes."  So, presumably
since
<https://github.com/llvm/llvm-project/commit/bf099f4682bf088aaa49b2c72fb1ef3250213fbb>
"[llvm][ADT] Structured bindings for move-only types in `StringMap` (#114676)"
changed

> -template <std::size_t I, typename ValueTy>
> -struct tuple_element<I, llvm::StringMapEntry<ValueTy>>
> -    : std::conditional<I == 0, llvm::StringRef, ValueTy> {};
> +template <std::size_t Index, typename ValueTy>
> +struct std::tuple_element<Index, llvm::StringMapEntry<ValueTy>>
> +    : std::tuple_element<Index, std::pair<llvm::StringRef, ValueTy>> {};

in LLVM's llvm/include/llvm/ADT/StringMapEntry.h, our !forallBases check here
started to trivially always be true for that struct tuple_element
specialization, so the isDerivedFrom check in
CheckFileVisitor::VisitCXXRecordDecl in
compilerplugins/clang/sharedvisitor/analyzer.cxx started to erroneously be true
for that struct, so it started to generate
compilerplugins/clang/sharedvisitor/*.plugininfo files with bogus extra

> InfoVersion:1
> ClassName:tuple_element
> InfoEnd

content, which in turn caused the generated
compilerplugins/clang/sharedvisitor/sharedvisitor.cxx to contain lots of

> #include "tuple_element.cxx"

and other nonsense, which caused the build to break with

> [CXX] compilerplugins/clang/sharedvisitor/sharedvisitor.cxx
> lo/core/compilerplugins/clang/sharedvisitor/sharedvisitor.cxx:20:10: fatal error: 'tuple_element.cxx' file not found
>    20 | #include "tuple_element.cxx"
>       |          ^~~~~~~~~~~~~~~~~~~

etc.

(And now spelling out the implementation of forAnyBase here also reveals that
BaseCheckSubclass will never be called with a null BaseDefinition, so the code
handling that has been removed.)

Change-Id: I8a6e42260eae86852ec37a80d058777653fac394
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176042
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann
2024-11-05 12:47:54 +01:00
parent bb9090c60b
commit 25673aaeda
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compilerplugins/clang/check.cxx
+27 -7
View File
@@ -374,14 +374,34 @@ bool isOkToRemoveArithmeticCast(
}
static bool BaseCheckNotSubclass(const clang::CXXRecordDecl *BaseDefinition, void *p) {
if (!BaseDefinition)
return true;
static bool BaseCheckSubclass(const clang::CXXRecordDecl *BaseDefinition, void *p) {
assert(BaseDefinition != nullptr);
auto const & base = *static_cast<const DeclChecker *>(p);
if (base(BaseDefinition)) {
return false;
return true;
}
return true;
return false;
}
bool forAnyBase(
clang::CXXRecordDecl const * decl, clang::CXXRecordDecl::ForallBasesCallback matches)
{
// Based on the implementation of clang::CXXRecordDecl::forallBases in LLVM's
// clang/lib/AST/CXXInheritance.cpp:
for (auto const & i: decl->bases()) {
auto const t = i.getType()->getAs<clang::RecordType>();
if (t == nullptr) {
return false;
}
auto const b = llvm::cast_or_null<clang::CXXRecordDecl>(t->getDecl()->getDefinition());
if (b == nullptr || (b->isDependentContext() && !b->isCurrentInstantiation(decl))) {
return false;
}
if (matches(b) || forAnyBase(b, matches)) {
return true;
}
}
return false;
}
bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base, bool checkSelf) {
@@ -392,9 +412,9 @@ bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base, bool chec
if (!decl->hasDefinition()) {
return false;
}
if (!decl->forallBases(
if (forAnyBase(decl,
[&base](const clang::CXXRecordDecl *BaseDefinition) -> bool
{ return BaseCheckNotSubclass(BaseDefinition, &base); }))
{ return BaseCheckSubclass(BaseDefinition, &base); }))
{
return true;
}