hokein created this revision.
hokein added a reviewer: gribozavr.
Herald added a subscriber: xazax.hun.
Herald added a project: clang.
The previous matcher "hasAnyTemplateArgument(templateArgument())" only
matches the first template argument, but the check wants to iterate all
template arguments. This patch fixes this.
Also some refactorings in this patch (to make the code reusable).
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D66945
Files:
clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp
clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp
Index: clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp
+++ clang-tools-extra/test/clang-tidy/misc-unused-using-decls.cpp
@@ -29,6 +29,10 @@
class N {};
template <int T> class P {};
+
+template <typename T>
+class Q {};
+
const int Constant = 0;
class Base {
@@ -169,6 +173,8 @@
using n::Constant;
// CHECK-MESSAGES: :[[@LINE-1]]:10: warning: using decl 'Constant' is unused
+using n::Q;
+
// ----- Usages -----
void f(B b);
void g() {
@@ -202,3 +208,7 @@
template <int T>
void i(n::P<T>* t) {}
template void i(n::P<Constant>* t);
+
+template <typename T, template <typename> class U>
+class Bar {};
+Bar<int, Q> *bar;
Index: clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp
+++ clang-tools-extra/clang-tidy/misc/UnusedUsingDeclsCheck.cpp
@@ -37,13 +37,11 @@
Finder->addMatcher(callExpr(callee(unresolvedLookupExpr().bind("used"))),
this);
Finder->addMatcher(
- callExpr(hasDeclaration(functionDecl(hasAnyTemplateArgument(
- anyOf(refersToTemplate(templateName().bind("used")),
- refersToDeclaration(functionDecl().bind("used"))))))),
+ callExpr(hasDeclaration(functionDecl(hasAnyTemplateArgument(anything()))
+ .bind("used_template_args"))),
this);
- Finder->addMatcher(loc(templateSpecializationType(hasAnyTemplateArgument(
- templateArgument().bind("used")))),
- this);
+ Finder->addMatcher(
+ loc(templateSpecializationType().bind("used_template_args")), this);
}
void UnusedUsingDeclsCheck::check(const MatchFinder::MatchResult &Result) {
@@ -85,47 +83,57 @@
// corresponding using declaration has been found.
// FIXME: This currently doesn't look at whether the type reference is
// actually found with the help of the using declaration.
- if (const auto *Used = Result.Nodes.getNodeAs<NamedDecl>("used")) {
+ auto RemoveNamedDecl = [&](const NamedDecl *Used) {
+ removeFromFoundDecls(Used);
if (const auto *FD = dyn_cast<FunctionDecl>(Used)) {
removeFromFoundDecls(FD->getPrimaryTemplate());
} else if (const auto *Specialization =
dyn_cast<ClassTemplateSpecializationDecl>(Used)) {
- Used = Specialization->getSpecializedTemplate();
+ removeFromFoundDecls(Specialization->getSpecializedTemplate());
+ } else if (const auto *FD = dyn_cast<FunctionDecl>(Used)) {
+ if (const auto *FDT = FD->getPrimaryTemplate())
+ removeFromFoundDecls(FDT);
+ } else if (const auto *ECD = dyn_cast<EnumConstantDecl>(Used)) {
+ if (const auto *ET = ECD->getType()->getAs<EnumType>())
+ removeFromFoundDecls(ET->getDecl());
}
- removeFromFoundDecls(Used);
+ };
+
+ if (const auto *Used = Result.Nodes.getNodeAs<NamedDecl>("used")) {
+ RemoveNamedDecl(Used);
return;
}
- if (const auto *Used = Result.Nodes.getNodeAs<TemplateArgument>("used")) {
- // FIXME: Support non-type template parameters.
- if (Used->getKind() == TemplateArgument::Template) {
- if (const auto *TD = Used->getAsTemplate().getAsTemplateDecl())
- removeFromFoundDecls(TD);
- } else if (Used->getKind() == TemplateArgument::Type) {
- if (auto *RD = Used->getAsType()->getAsCXXRecordDecl())
- removeFromFoundDecls(RD);
- }
+ if (const auto *DRE = Result.Nodes.getNodeAs<DeclRefExpr>("used")) {
+ RemoveNamedDecl(DRE->getDecl());
return;
}
-
- if (const auto *Used = Result.Nodes.getNodeAs<TemplateName>("used")) {
- removeFromFoundDecls(Used->getAsTemplateDecl());
+
+ auto RemoveIfUsedInTemplateArguments =
+ [&](llvm::ArrayRef<TemplateArgument> TemplateArgs) {
+ for (const auto &Arg : TemplateArgs) {
+ if (Arg.getKind() == TemplateArgument::Template) {
+ if (const auto *TD = Arg.getAsTemplate().getAsTemplateDecl())
+ RemoveNamedDecl(TD);
+ } else if (Arg.getKind() == TemplateArgument::Type) {
+ if (auto *RD = Arg.getAsType()->getAsCXXRecordDecl())
+ RemoveNamedDecl(RD);
+ } else if (Arg.getKind() == TemplateArgument::Declaration) {
+ RemoveNamedDecl(Arg.getAsDecl());
+ }
+ }
+ };
+ if (const auto *TFD =
+ Result.Nodes.getNodeAs<FunctionDecl>("used_template_args")) {
+ if (const auto *TemplateArgs = TFD->getTemplateSpecializationArgs())
+ RemoveIfUsedInTemplateArguments(TemplateArgs->asArray());
return;
}
-
- if (const auto *DRE = Result.Nodes.getNodeAs<DeclRefExpr>("used")) {
- if (const auto *FD = dyn_cast<FunctionDecl>(DRE->getDecl())) {
- if (const auto *FDT = FD->getPrimaryTemplate())
- removeFromFoundDecls(FDT);
- else
- removeFromFoundDecls(FD);
- } else if (const auto *VD = dyn_cast<VarDecl>(DRE->getDecl())) {
- removeFromFoundDecls(VD);
- } else if (const auto *ECD = dyn_cast<EnumConstantDecl>(DRE->getDecl())) {
- removeFromFoundDecls(ECD);
- if (const auto *ET = ECD->getType()->getAs<EnumType>())
- removeFromFoundDecls(ET->getDecl());
- }
+ if (const auto *U = Result.Nodes.getNodeAs<TemplateSpecializationType>(
+ "used_template_args")) {
+ RemoveIfUsedInTemplateArguments(
+ llvm::makeArrayRef(U->getArgs(), U->getNumArgs()));
+ return;
}
// Check the uninstantiated template function usage.
if (const auto *ULE = Result.Nodes.getNodeAs<UnresolvedLookupExpr>("used")) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
