caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clang-tidy][NFC] simplify matchers in bugprone-optional-value-conversion (#119346)

Browse Source 
combine type matcher and optional type check.
This commit is contained in:
Congcong Cai
2024-12-10 18:00:41 +08:00
committed by GitHub
parent 56ddbeff83
commit e69d8b8708
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
clang-tools-extra/clang-tidy/bugprone/OptionalValueConversionCheck.cpp
View File

@@ -43,18 +43,20 @@ OptionalValueConversionCheck::getCheckTraversalKind() const {
}
void OptionalValueConversionCheck::registerMatchers(MatchFinder *Finder) {
auto ConstructTypeMatcher =
qualType(hasCleanType(qualType().bind("optional-type")));
auto BindOptionalType = qualType(
hasCleanType(qualType(hasDeclaration(namedDecl(
matchers::matchesAnyListedName(OptionalTypes))))
.bind("optional-type")));
auto CallTypeMatcher =
auto EqualsBoundOptionalType =
qualType(hasCleanType(equalsBoundNode("optional-type")));
auto OptionalDereferenceMatcher = callExpr(
anyOf(
cxxOperatorCallExpr(hasOverloadedOperatorName("*"),
hasUnaryOperand(hasType(CallTypeMatcher)))
hasUnaryOperand(hasType(EqualsBoundOptionalType)))
.bind("op-call"),
cxxMemberCallExpr(thisPointerType(CallTypeMatcher),
cxxMemberCallExpr(thisPointerType(EqualsBoundOptionalType),
callee(cxxMethodDecl(anyOf(
hasOverloadedOperatorName("*"),
matchers::matchesAnyListedName(ValueMethods)))))
@@ -66,10 +68,7 @@ void OptionalValueConversionCheck::registerMatchers(MatchFinder *Finder) {
hasArgument(0, ignoringImpCasts(OptionalDereferenceMatcher)));
Finder->addMatcher(
cxxConstructExpr(
argumentCountIs(1U),
hasDeclaration(cxxConstructorDecl(
ofClass(matchers::matchesAnyListedName(OptionalTypes)))),
hasType(ConstructTypeMatcher),
argumentCountIs(1U), hasType(BindOptionalType),
hasArgument(0U, ignoringImpCasts(anyOf(OptionalDereferenceMatcher,
StdMoveCallMatcher))),
unless(anyOf(hasAncestor(typeLoc()),