Skip to content

[AstMatcher]templateArgumentCountIs support FunctionDecl #130416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 11, 2025
Merged

[AstMatcher]templateArgumentCountIs support FunctionDecl #130416

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca39210
[clang-tidy][NFC]refactor matcher for bugprone-optional-value-conversion
HerrCai0907 Mar 8, 2025
97ea315
[AstMatcher]`templateArgumentCountIs` support `FunctionDecl`
HerrCai0907 Mar 8, 2025
b28bd17
[AstMatcher]`templateArgumentCountIs` support `FunctionDecl`
HerrCai0907 Mar 8, 2025
397c487
Merge remote-tracking branch 'origin/main' into users/ccc03-08-_astma…
HerrCai0907 Mar 11, 2025
c04d320
add doc
HerrCai0907 Mar 11, 2025
d4d9536
Merge remote-tracking branch 'origin/users/ccc03-08-_astmatcher_templ…
HerrCai0907 Mar 11, 2025
3e2a7ef
add test and doc
HerrCai0907 Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions clang-tools-extra/clang-tidy/bugprone/OptionalValueConversionCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,11 @@ AST_MATCHER_P(QualType, hasCleanType, Matcher<QualType>, InnerMatcher) {
Finder, Builder);
}

constexpr std::array<StringRef, 2> NameList{
constexpr std::array<StringRef, 2> MakeSmartPtrList{
"::std::make_unique",
"::std::make_shared",
};

Matcher<Expr> constructFrom(Matcher<QualType> TypeMatcher,
Matcher<Expr> ArgumentMatcher) {
return expr(
anyOf(
// construct optional
cxxConstructExpr(argumentCountIs(1U), hasType(TypeMatcher),
hasArgument(0U, ArgumentMatcher)),
// known template methods in std
callExpr(argumentCountIs(1),
callee(functionDecl(
matchers::matchesAnyListedName(NameList),
hasTemplateArgument(0, refersToType(TypeMatcher)))),
hasArgument(0, ArgumentMatcher))),
unless(anyOf(hasAncestor(typeLoc()),
hasAncestor(expr(matchers::hasUnevaluatedContext())))));
}

} // namespace

OptionalValueConversionCheck::OptionalValueConversionCheck(
Expand All @@ -74,7 +57,7 @@ void OptionalValueConversionCheck::registerMatchers(MatchFinder *Finder) {
auto EqualsBoundOptionalType =
qualType(hasCleanType(equalsBoundNode("optional-type")));

auto OptionalDereferenceMatcher = callExpr(
auto OptionalDerefMatcherImpl = callExpr(
anyOf(
cxxOperatorCallExpr(hasOverloadedOperatorName("*"),
hasUnaryOperand(hasType(EqualsBoundOptionalType)))
Expand All @@ -88,11 +71,24 @@ void OptionalValueConversionCheck::registerMatchers(MatchFinder *Finder) {

auto StdMoveCallMatcher =
callExpr(argumentCountIs(1), callee(functionDecl(hasName("::std::move"))),
hasArgument(0, ignoringImpCasts(OptionalDereferenceMatcher)));
hasArgument(0, ignoringImpCasts(OptionalDerefMatcherImpl)));
auto OptionalDerefMatcher =
ignoringImpCasts(anyOf(OptionalDerefMatcherImpl, StdMoveCallMatcher));

Finder->addMatcher(
expr(constructFrom(BindOptionalType,
ignoringImpCasts(anyOf(OptionalDereferenceMatcher,
StdMoveCallMatcher))))
expr(anyOf(
// construct optional
cxxConstructExpr(argumentCountIs(1), hasType(BindOptionalType),
hasArgument(0, OptionalDerefMatcher)),
// known template methods in std
callExpr(
argumentCountIs(1),
callee(functionDecl(
matchers::matchesAnyListedName(MakeSmartPtrList),
hasTemplateArgument(0, refersToType(BindOptionalType)))),
hasArgument(0, OptionalDerefMatcher))),
unless(anyOf(hasAncestor(typeLoc()),
hasAncestor(expr(matchers::hasUnevaluatedContext())))))
.bind("expr"),
this);
}
Expand Down
1 change: 1 addition & 0 deletions clang/include/clang/ASTMatchers/ASTMatchers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,7 @@ AST_POLYMORPHIC_MATCHER_P2(
AST_POLYMORPHIC_MATCHER_P(
templateArgumentCountIs,
AST_POLYMORPHIC_SUPPORTED_TYPES(ClassTemplateSpecializationDecl,
VarTemplateSpecializationDecl, FunctionDecl,
Copy link
Collaborator

@AaronBallman AaronBallman Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd probably be good to update the example code above. Also, can you add test coverage to clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp?

TemplateSpecializationType),
unsigned, N) {
return internal::getTemplateSpecializationArgs(Node).size() == N;
Expand Down
Loading