llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-tools-extra @llvm/pr-subscribers-clang-tidy Author: Congcong Cai (HerrCai0907) <details> <summary>Changes</summary> combine type matcher and optional type check. --- Full diff: https://github.com/llvm/llvm-project/pull/119346.diff 1 Files Affected: - (modified) clang-tools-extra/clang-tidy/bugprone/OptionalValueConversionCheck.cpp (+8-9) ``````````diff diff --git a/clang-tools-extra/clang-tidy/bugprone/OptionalValueConversionCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/OptionalValueConversionCheck.cpp index 600eab37552766..f2ff27d85fb004 100644 --- a/clang-tools-extra/clang-tidy/bugprone/OptionalValueConversionCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/OptionalValueConversionCheck.cpp @@ -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()), `````````` </details> https://github.com/llvm/llvm-project/pull/119346 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
