compilerplugins/clang/stringview.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
New commits: commit 99e019708609a52ea6b2ad29fc945c4dc4160351 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Fri Oct 14 14:32:27 2022 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Fri Oct 14 16:06:01 2022 +0200 Clean up loplugin:stringview ...after 3d236177be255b2027a997bfc12fe0833ca9a2f7 "Deduplicate O(U)StringConcatenation" changed OStringConcat and OUStringConcat into aliases (so they will get looked through by loplugin::TypeCheck::Struct's use of getAs<clang::RecordType> in compilerplugins/clang/check.hxx), but apparently forgot to drop their respective checks here. (That the then-added check for StringConcat works as intended is verified by compilerplugins/clang/test/stringview.cxx, btw.) Change-Id: I3f8e26998d0a55704f0433a818493ef541fd05eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141370 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/compilerplugins/clang/stringview.cxx b/compilerplugins/clang/stringview.cxx index 6c1ec077bce5..feb91ccc253c 100644 --- a/compilerplugins/clang/stringview.cxx +++ b/compilerplugins/clang/stringview.cxx @@ -217,9 +217,7 @@ void StringView::handleCXXConstructExpr(CXXConstructExpr const* expr) argType = expr->getArg(0)->IgnoreImplicit()->getType(); break; } - if (tc.RvalueReference().Struct("OStringConcat").Namespace("rtl").GlobalNamespace() - || tc.RvalueReference().Struct("OUStringConcat").Namespace("rtl").GlobalNamespace() - || tc.RvalueReference().Struct("StringConcat").Namespace("rtl").GlobalNamespace()) + if (tc.RvalueReference().Struct("StringConcat").Namespace("rtl").GlobalNamespace()) { argType = expr->getArg(0)->IgnoreImplicit()->getType(); extra = ViaConcatenation;