fixup! Improve isSimpleChar and move it into utils/Matchers.h

Author: mikecrowe

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

@@ -20,11 +20,6 @@ namespace clang::tidy::modernize {
 
 namespace {
 AST_MATCHER(StringLiteral, isOrdinary) { return Node.isOrdinary(); }
-AST_MATCHER(QualType, isSimpleChar) {
-  const auto ActualType = Node.getTypePtr();
-  return ActualType->isSpecificBuiltinType(BuiltinType::Char_S) ||
-         ActualType->isSpecificBuiltinType(BuiltinType::Char_U);
-}
 } // namespace
 
 UseStdFormatCheck::UseStdFormatCheck(StringRef Name, ClangTidyContext *Context)
@@ -52,7 +47,8 @@ void UseStdFormatCheck::registerPPCallbacks(const SourceManager &SM,
 }
 
 void UseStdFormatCheck::registerMatchers(MatchFinder *Finder) {
-  auto CharPointerType = hasType(pointerType(pointee(isSimpleChar())));
+  auto CharPointerType =
+      hasType(pointerType(pointee(matchers::isSimpleChar())));
   Finder->addMatcher(
       callExpr(
           argumentCountAtLeast(1), hasArgument(0, stringLiteral(isOrdinary())),

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

@@ -20,11 +20,6 @@ namespace clang::tidy::modernize {
 
 namespace {
 AST_MATCHER(StringLiteral, isOrdinary) { return Node.isOrdinary(); }
-AST_MATCHER(QualType, isSimpleChar) {
-  const auto ActualType = Node.getTypePtr();
-  return ActualType->isSpecificBuiltinType(BuiltinType::Char_S) ||
-         ActualType->isSpecificBuiltinType(BuiltinType::Char_U);
-}
 } // namespace
 
 UseStdPrintCheck::UseStdPrintCheck(StringRef Name, ClangTidyContext *Context)
@@ -100,7 +95,8 @@ unusedReturnValue(clang::ast_matchers::StatementMatcher MatchedCallExpr) {
 }
 
 void UseStdPrintCheck::registerMatchers(MatchFinder *Finder) {
-  auto CharPointerType = hasType(pointerType(pointee(isSimpleChar())));
+  auto CharPointerType =
+      hasType(pointerType(pointee(matchers::isSimpleChar())));
   if (!PrintfLikeFunctions.empty())
     Finder->addMatcher(
         unusedReturnValue(

clang-tools-extra/clang-tidy/utils/Matchers.h

@@ -49,6 +49,14 @@ AST_MATCHER_FUNCTION(ast_matchers::TypeMatcher, isPointerToConst) {
   return pointerType(pointee(qualType(isConstQualified())));
 }
 
+// Returns QualType matcher for target char type only.
+AST_MATCHER(QualType, isSimpleChar) {
+  const auto ActualType = Node.getTypePtr();
+  return ActualType &&
+         (ActualType->isSpecificBuiltinType(BuiltinType::Char_S) ||
+          ActualType->isSpecificBuiltinType(BuiltinType::Char_U));
+}
+
 AST_MATCHER(Expr, hasUnevaluatedContext) {
   if (isa<CXXNoexceptExpr>(Node) || isa<RequiresExpr>(Node))
     return true;