diff options
| -rw-r--r-- | clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp | 22 | ||||
| -rw-r--r-- | clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp | 10 |
2 files changed, 22 insertions, 10 deletions
diff --git a/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp b/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp index 1269c3b34e4..3927a787110 100644 --- a/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/UnusedParametersCheck.cpp @@ -16,6 +16,13 @@ using namespace clang::ast_matchers; namespace clang { namespace tidy { +namespace { +bool isOverrideMethod(const FunctionDecl *Function) { + if (const auto *MD = dyn_cast<CXXMethodDecl>(Function)) + return MD->size_overridden_methods() > 0 || MD->hasAttr<OverrideAttr>(); + return false; +} +} // namespace void UnusedParametersCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher(functionDecl().bind("function"), this); @@ -63,20 +70,15 @@ void UnusedParametersCheck::warnOnUnusedParameter( auto MyDiag = diag(Param->getLocation(), "parameter '%0' is unused") << Param->getName(); - auto UsedByRef = [&] { - return !ast_matchers::match( - decl(hasDescendant( - declRefExpr(to(equalsNode(Function)), - unless(hasAncestor( - callExpr(callee(equalsNode(Function)))))))), - *Result.Context->getTranslationUnitDecl(), *Result.Context) - .empty(); - }; + auto DeclRefExpr = + declRefExpr(to(equalsNode(Function)), + unless(hasAncestor(callExpr(callee(equalsNode(Function)))))); // Comment out parameter name for non-local functions. if (Function->isExternallyVisible() || !Result.SourceManager->isInMainFile(Function->getLocation()) || - UsedByRef()) { + !ast_matchers::match(DeclRefExpr, *Result.Context).empty() || + isOverrideMethod(Function)) { SourceRange RemovalRange(Param->getLocation(), Param->getLocEnd()); // Note: We always add a space before the '/*' to not accidentally create a // '*/*' for pointer types, which doesn't start a comment. clang-format will diff --git a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp b/clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp index 106bb54780d..fc20b2b3c4e 100644 --- a/clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp +++ b/clang-tools-extra/test/clang-tidy/misc-unused-parameters.cpp @@ -127,6 +127,16 @@ void someMoreCallSites() { useFunction(&C::h); } +class Base { + virtual void f(int i); +}; + +class Derived : public Base { + void f(int i) override {} +// CHECK-MESSAGES: :[[@LINE-1]]:14: warning +// CHECK-FIXES: void f(int /*i*/) override {} +}; + } // end namespace template <typename T> void someFunctionTemplate(T b, T e) { (void)b; (void)e; } |
