https://github.com/HerrCai0907 updated https://github.com/llvm/llvm-project/pull/70230
>From 7ba5e132f50730b9e9cb392df7a2756066a7e909 Mon Sep 17 00:00:00 2001 From: Congcong Cai <congcongcai0...@163.com> Date: Mon, 23 Oct 2023 09:00:26 +0800 Subject: [PATCH 1/2] [clang-tidy]fix misc-unused-using-decls false positive false for using in elaborated type --- .../clang-tidy/misc/UnusedUsingDeclsCheck.cpp | 11 +++++++++++ clang-tools-extra/docs/ReleaseNotes.rst | 4 ++++ .../clang-tidy/checkers/misc/unused-using-decls.cpp | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp b/clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp index 14b6aca6f3b8fac..14f822c1c086ab9 100644 --- a/clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp @@ -8,6 +8,7 @@ #include "UnusedUsingDeclsCheck.h" #include "clang/AST/ASTContext.h" +#include "clang/AST/Decl.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/Lex/Lexer.h" @@ -71,6 +72,10 @@ void UnusedUsingDeclsCheck::registerMatchers(MatchFinder *Finder) { templateArgument().bind("used")))), this); Finder->addMatcher(userDefinedLiteral().bind("used"), this); + Finder->addMatcher( + elaboratedType(unless(hasQualifier(nestedNameSpecifier())), + hasUnqualifiedDesugaredType(type().bind("usedType"))), + this); // Cases where we can identify the UsingShadowDecl directly, rather than // just its target. // FIXME: cover more cases in this way, as the AST supports it. @@ -145,6 +150,12 @@ void UnusedUsingDeclsCheck::check(const MatchFinder::MatchResult &Result) { return; } + if (const auto *T = Result.Nodes.getNodeAs<Type>("usedType")) { + if (const auto *ND = T->getAsTagDecl()) + RemoveNamedDecl(ND); + return; + } + if (const auto *UsedShadow = Result.Nodes.getNodeAs<UsingShadowDecl>("usedShadow")) { removeFromFoundDecls(UsedShadow->getTargetDecl()); diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index b5348384e965ab5..3227e2ef9d81c83 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -290,6 +290,10 @@ Changes in existing checks <clang-tidy/checks/misc/redundant-expression>` check to ignore false-positives in unevaluated context (e.g., ``decltype``). +- Improved :doc:`misc-unused-using-decls + <clang-tidy/checks/misc/unused-using-decls>` check to avoid false positive when + using in elaborated type. + - Improved :doc:`modernize-avoid-bind <clang-tidy/checks/modernize/avoid-bind>` check to not emit a ``return`` for fixes when the function returns ``void``. diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls.cpp index 7d02aa4d2e2bf90..12fc18f340f2130 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-using-decls.cpp @@ -213,3 +213,12 @@ template <typename T, template <typename> class U> class Bar {}; // We used to report Q unsued, because we only checked the first template // argument. Bar<int, Q> *bar; + +namespace gh69714 { +struct StructGH69714_1 {}; +struct StructGH69714_2 {}; +} // namespace gh69714 +using gh69714::StructGH69714_1; +using gh69714::StructGH69714_2; +struct StructGH69714_1 a; +struct StructGH69714_2 *b; >From 8ebd9194788e1d57dc46ed710d932a10db301d67 Mon Sep 17 00:00:00 2001 From: Congcong Cai <congcongcai0...@163.com> Date: Thu, 26 Oct 2023 08:36:19 +0800 Subject: [PATCH 2/2] fix --- clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp b/clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp index 14f822c1c086ab9..051375263e53c3f 100644 --- a/clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp @@ -73,8 +73,8 @@ void UnusedUsingDeclsCheck::registerMatchers(MatchFinder *Finder) { this); Finder->addMatcher(userDefinedLiteral().bind("used"), this); Finder->addMatcher( - elaboratedType(unless(hasQualifier(nestedNameSpecifier())), - hasUnqualifiedDesugaredType(type().bind("usedType"))), + loc(elaboratedType(unless(hasQualifier(nestedNameSpecifier())), + hasUnqualifiedDesugaredType(type().bind("usedType")))), this); // Cases where we can identify the UsingShadowDecl directly, rather than // just its target. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits