Fix false positive and negative

Author: localspook

clang-tools-extra/clang-tidy/readability/RedundantTypenameCheck.cpp

@@ -20,7 +20,9 @@ using namespace clang::ast_matchers::internal;
 namespace clang::tidy::readability {
 
 void RedundantTypenameCheck::registerMatchers(MatchFinder *Finder) {
-  Finder->addMatcher(typedefTypeLoc().bind("typedefTypeLoc"), this);
+  Finder->addMatcher(typeLoc(unless(hasAncestor(decl(isInstantiated()))))
+                         .bind("nonDependentTypeLoc"),
+                     this);
 
   if (!getLangOpts().CPlusPlus20)
     return;
@@ -38,25 +40,32 @@ void RedundantTypenameCheck::registerMatchers(MatchFinder *Finder) {
           // Match return types.
           functionDecl(unless(cxxConversionDecl()))))),
       hasParent(expr(anyOf(cxxNamedCastExpr(), cxxNewExpr()))));
-  Finder->addMatcher(typeLoc(InImplicitTypenameContext).bind("typeloc"), this);
+  Finder->addMatcher(
+      typeLoc(InImplicitTypenameContext).bind("dependentTypeLoc"), this);
 }
 
 void RedundantTypenameCheck::check(const MatchFinder::MatchResult &Result) {
   const SourceLocation ElaboratedKeywordLoc = [&] {
-    if (const auto *TTL =
-            Result.Nodes.getNodeAs<TypedefTypeLoc>("typedefTypeLoc"))
-      return TTL->getElaboratedKeywordLoc();
+    if (const auto *NonDependentTypeLoc =
+            Result.Nodes.getNodeAs<TypeLoc>("nonDependentTypeLoc")) {
+      if (const auto TTL = NonDependentTypeLoc->getAs<TypedefTypeLoc>())
+        return TTL.getElaboratedKeywordLoc();
 
-    TypeLoc InnermostTypeLoc = *Result.Nodes.getNodeAs<TypeLoc>("typeloc");
-    while (const TypeLoc Next = InnermostTypeLoc.getNextTypeLoc())
-      InnermostTypeLoc = Next;
+      if (const auto TTL = NonDependentTypeLoc->getAs<TagTypeLoc>())
+        return TTL.getElaboratedKeywordLoc();
+    } else {
+      TypeLoc InnermostTypeLoc =
+          *Result.Nodes.getNodeAs<TypeLoc>("dependentTypeLoc");
+      while (const TypeLoc Next = InnermostTypeLoc.getNextTypeLoc())
+        InnermostTypeLoc = Next;
 
-    if (const auto DNTL = InnermostTypeLoc.getAs<DependentNameTypeLoc>())
-      return DNTL.getElaboratedKeywordLoc();
+      if (const auto DNTL = InnermostTypeLoc.getAs<DependentNameTypeLoc>())
+        return DNTL.getElaboratedKeywordLoc();
 
-    if (const auto TSTL =
-            InnermostTypeLoc.getAs<TemplateSpecializationTypeLoc>())
-      return TSTL.getElaboratedKeywordLoc();
+      if (const auto TSTL =
+              InnermostTypeLoc.getAs<TemplateSpecializationTypeLoc>())
+        return TSTL.getElaboratedKeywordLoc();
+    }
 
     return SourceLocation();
   }();

clang-tools-extra/test/clang-tidy/checkers/readability/redundant-typename.cpp

@@ -5,11 +5,12 @@
 
 struct NotDependent {
   using R = int;
+  struct S {};
 };
 
-auto f(typename NotDependent::R)
+auto f(typename NotDependent::S)
   // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: redundant 'typename' [readability-redundant-typename]
-  // CHECK-FIXES: auto f(NotDependent::R)
+  // CHECK-FIXES: auto f(NotDependent::S)
   -> typename NotDependent::R
   // CHECK-MESSAGES: :[[@LINE-1]]:6: warning: redundant 'typename' [readability-redundant-typename]
   // CHECK-FIXES: -> NotDependent::R
@@ -142,7 +143,9 @@ typename T::R f();
 // CHECK-FIXES-20: T::R f();
 
 template <typename T>
-void n(typename T::R);
+void n(typename T::R *) {}
+
+template void n<NotDependent>(int *);
 
 namespace ns {
 

clang/include/clang/ASTMatchers/ASTMatchers.h

@@ -7001,20 +7001,6 @@ extern const internal::VariadicDynCastAllOfMatcher<
     TypeLoc, TemplateSpecializationTypeLoc>
     templateSpecializationTypeLoc;
 
-/// Matches `TypedefTypeLoc`s.
-///
-/// Given
-/// \code
-///   using t1 = int;
-///   template <typename T> struct S { using t2 = int; };
-///   t1 var1;
-///   const S<char>::t2* var2;
-/// \endcode
-/// typedefTypeLoc()
-///   matches `t1` (in the declaration of var1) and `S<char>::t2`.
-extern const internal::VariadicDynCastAllOfMatcher<TypeLoc, TypedefTypeLoc>
-    typedefTypeLoc;
-
 /// Matches template specialization `TypeLoc`s, class template specializations,
 /// variable template specializations, and function template specializations
 /// that have at least one `TemplateArgumentLoc` matching the given

clang/lib/ASTMatchers/ASTMatchersInternal.cpp

@@ -810,8 +810,6 @@ const internal::VariadicDynCastAllOfMatcher<TypeLoc, ReferenceTypeLoc>
 const internal::VariadicDynCastAllOfMatcher<TypeLoc,
                                             TemplateSpecializationTypeLoc>
     templateSpecializationTypeLoc;
-const internal::VariadicDynCastAllOfMatcher<TypeLoc, TypedefTypeLoc>
-    typedefTypeLoc;
 
 const internal::VariadicDynCastAllOfMatcher<Stmt, UnaryExprOrTypeTraitExpr>
     unaryExprOrTypeTraitExpr;