Prefer FunctionTypeLoc over FunctionProtoTypeLoc, move matcher into ASTMatchers.h

Author: localspook

clang-tools-extra/clang-tidy/modernize/RedundantVoidArgCheck.cpp

@@ -11,31 +11,26 @@
 #include "clang/ASTMatchers/ASTMatchers.h"
 
 using namespace clang::ast_matchers;
-using namespace clang::ast_matchers::internal;
 
 namespace clang::tidy::modernize {
 
 void RedundantVoidArgCheck::registerMatchers(MatchFinder *Finder) {
-  const VariadicDynCastAllOfMatcher<TypeLoc, FunctionProtoTypeLoc>
-      functionProtoTypeLoc; // NOLINT(readability-identifier-naming)
-  Finder->addMatcher(traverse(TK_IgnoreUnlessSpelledInSource,
-                              functionProtoTypeLoc(
-                                  unless(hasParent(functionDecl(isExternC()))))
-                                  .bind("fn")),
-                     this);
+  Finder->addMatcher(
+      traverse(TK_IgnoreUnlessSpelledInSource,
+               functionTypeLoc(unless(hasParent(functionDecl(isExternC()))))
+                   .bind("fn")),
+      this);
   Finder->addMatcher(
       traverse(TK_IgnoreUnlessSpelledInSource, lambdaExpr().bind("fn")), this);
 }
 
 void RedundantVoidArgCheck::check(const MatchFinder::MatchResult &Result) {
-  const FunctionProtoTypeLoc TL = [&] {
-    if (const auto *TL = Result.Nodes.getNodeAs<FunctionProtoTypeLoc>("fn"))
+  const FunctionTypeLoc TL = [&] {
+    if (const auto *TL = Result.Nodes.getNodeAs<FunctionTypeLoc>("fn"))
       return *TL;
     return Result.Nodes.getNodeAs<LambdaExpr>("fn")
         ->getCallOperator()
-        ->getTypeSourceInfo()
-        ->getTypeLoc()
-        .getAs<FunctionProtoTypeLoc>();
+        ->getFunctionTypeLoc();
   }();
 
   if (TL.getNumParams() != 0)

clang/include/clang/ASTMatchers/ASTMatchers.h

@@ -7016,6 +7016,19 @@ AST_MATCHER_P(ReferenceTypeLoc, hasReferentLoc, internal::Matcher<TypeLoc>,
 extern const internal::VariadicDynCastAllOfMatcher<TypeLoc, ArrayTypeLoc>
     arrayTypeLoc;
 
+/// Matches `FunctionTypeLoc`s.
+///
+/// Given
+/// \code
+///   void f(int);
+///   double g(char, float) {}
+///   char (*fn_ptr)();
+/// \endcode
+/// functionTypeLoc()
+///   matches "void (int)", "double (char, float)", and "char ()".
+extern const internal::VariadicDynCastAllOfMatcher<TypeLoc, FunctionTypeLoc>
+    functionTypeLoc;
+
 /// Matches template specialization `TypeLoc`s.
 ///
 /// Given

clang/lib/ASTMatchers/ASTMatchersInternal.cpp

@@ -808,6 +808,8 @@ const internal::VariadicDynCastAllOfMatcher<TypeLoc, PointerTypeLoc>
 const internal::VariadicDynCastAllOfMatcher<TypeLoc, ReferenceTypeLoc>
     referenceTypeLoc;
 const internal::VariadicDynCastAllOfMatcher<TypeLoc, ArrayTypeLoc> arrayTypeLoc;
+const internal::VariadicDynCastAllOfMatcher<TypeLoc, FunctionTypeLoc>
+    functionTypeLoc;
 const internal::VariadicDynCastAllOfMatcher<TypeLoc,
                                             TemplateSpecializationTypeLoc>
     templateSpecializationTypeLoc;