[clang-tidy] google-explicit-constructor: ignore template instantiations

llvm-svn: 290753

1 files changed, 4 insertions, 2 deletions

diff --git a/clang-tools-extra/clang-tidy/google/ExplicitConstructorCheck.cpp b/clang-tools-extra/clang-tidy/google/ExplicitConstructorCheck.cpp
index 1257d100d3d..1605626d142 100644
--- a/clang-tools-extra/clang-tidy/google/ExplicitConstructorCheck.cpp
+++ b/clang-tools-extra/clang-tidy/google/ExplicitConstructorCheck.cpp
@@ -27,8 +27,10 @@ void ExplicitConstructorCheck::registerMatchers(MatchFinder *Finder) {
   Finder->addMatcher(cxxConstructorDecl(unless(isInstantiated())).bind("ctor"),
                      this);
   Finder->addMatcher(
-      cxxConversionDecl(unless(isExplicit()), // Already marked explicit.
-                        unless(isImplicit())) // Compiler-generated.
+      cxxConversionDecl(unless(anyOf(isExplicit(), // Already marked explicit.
+                                     isImplicit(), // Compiler-generated.
+                                     isInstantiated())))
+
           .bind("conversion"),
       this);
 }