[clang-tidy] Use new ASTMatchers to identify template instantiations instead of copying it everywhere.

No intended functionality change.

llvm-svn: 217035

3 files changed, 3 insertions, 13 deletions

diff --git a/clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp b/clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp
index 7e60a529aef..323139c85a0 100644
--- a/clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/MemsetZeroLengthCheck.cpp
@@ -21,15 +21,12 @@ namespace runtime {
 
 void
 MemsetZeroLengthCheck::registerMatchers(ast_matchers::MatchFinder *Finder) {
-  auto InTemplateInstantiation = hasAncestor(
-      decl(anyOf(recordDecl(ast_matchers::isTemplateInstantiation()),
-                 functionDecl(ast_matchers::isTemplateInstantiation()))));
   // Look for memset(x, y, 0) as those is most likely an argument swap.
   // TODO: Also handle other standard functions that suffer from the same
   //       problem, e.g. memchr.
   Finder->addMatcher(
       callExpr(callee(functionDecl(hasName("::memset"))), argumentCountIs(3),
-               unless(InTemplateInstantiation)).bind("decl"),
+               unless(isInTemplateInstantiation())).bind("decl"),
       this);
 }
 
diff --git a/clang-tools-extra/clang-tidy/google/StringReferenceMemberCheck.cpp b/clang-tools-extra/clang-tidy/google/StringReferenceMemberCheck.cpp
index f7b5559131e..82ffe72edc4 100644
--- a/clang-tools-extra/clang-tidy/google/StringReferenceMemberCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/StringReferenceMemberCheck.cpp
@@ -26,12 +26,8 @@ void StringReferenceMemberCheck::registerMatchers(
   auto ConstString = qualType(isConstQualified(), hasDeclaration(String));
 
   // Ignore members in template instantiations.
-  auto InTemplateInstantiation = hasAncestor(
-      decl(anyOf(recordDecl(ast_matchers::isTemplateInstantiation()),
-                 functionDecl(ast_matchers::isTemplateInstantiation()))));
-
   Finder->addMatcher(fieldDecl(hasType(references(ConstString)),
-                               unless(InTemplateInstantiation)).bind("member"),
+                               unless(isInstantiated())).bind("member"),
                      this);
 }
 
diff --git a/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.cpp b/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.cpp
index c745366cf44..dcc98aef053 100644
--- a/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.cpp
+++ b/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.cpp
@@ -24,9 +24,6 @@ AST_MATCHER(QualType, isBoolean) { return Node->isBooleanType(); }
 namespace tidy {
 
 void BoolPointerImplicitConversion::registerMatchers(MatchFinder *Finder) {
-  auto InTemplateInstantiation = hasAncestor(
-      decl(anyOf(recordDecl(ast_matchers::isTemplateInstantiation()),
-                 functionDecl(ast_matchers::isTemplateInstantiation()))));
   // Look for ifs that have an implicit bool* to bool conversion in the
   // condition. Filter negations.
   Finder->addMatcher(
@@ -36,7 +33,7 @@ void BoolPointerImplicitConversion::registerMatchers(MatchFinder *Finder) {
                            hasType(pointerType(pointee(isBoolean()))),
                            ignoringParenImpCasts(declRefExpr().bind("expr")))),
                        isPointerToBoolean())))),
-             unless(InTemplateInstantiation)).bind("if"),
+             unless(isInTemplateInstantiation())).bind("if"),
       this);
 }