[clang-rename] Fix the missing template constructors.

[hokein]

Summary

When renaming a class with template constructors, we are missing the
occurrences of the template constructors, because getUSRsForDeclaration doesn't
give USRs of the templated constructors (they are not in the normal ctors()
method).

[kbobyrev]

clang-tools-extra/clangd/unittests/RenameTests.cpp

144

nit: Maybe also add ^ to this one and the one below?

clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp

140

nit: The naming is slightly confusing, this probably suggests MethodDecl instance, but it's not spelled anywhere and may be better to call it just D.

clang/test/clang-rename/TemplateCtor.cpp

1 ↗

(On Diff #243147)

Nit: not sure if the new file is necessary, maybe just put this under .../Ctor.cpp?

[hokein]

address comments.

[kbobyrev]

Should be good to go, please run git-clang-format on the changes just to make sure.

Thanks for fixing this!

clang-tools-extra/clangd/unittests/RenameTests.cpp

141

nit: I think this is still not formatted as the comment has a different offset.

[hokein]

Fix the format.

clang-tools-extra/clangd/unittests/RenameTests.cpp

llvm::StringRef Tests[] = {
         template <typename T>
         class [[F^oo]] {
           [[F^oo]]();
           ~[[F^oo]]();
           void f([[Foo]] x);
         };
       )cpp",
 
+      // Rename template class constructor.
+      R"cpp(
+        class [[F^oo]] {
+          template<typename T>
+          [[Fo^o]]();
+
+          template<typename T>
+          [[F^oo]](T t);
+        };
+      )cpp",
+
       // Class in template argument.
       R"cpp(
         class [[F^oo]] {};
         template <typename T> void func();
         template <typename T> class Baz {};
         int main() {
           func<[[F^oo]]>();
           Baz<[[F^oo]]> obj;

clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp

void addUSRsOfCtorDtors(const CXXRecordDecl *RecordDecl) {
     RecordDecl = RecordDecl->getDefinition();
 
     // Skip if the CXXRecordDecl doesn't have definition.
     if (!RecordDecl)
       return;
 
     for (const auto *CtorDecl : RecordDecl->ctors())
       USRSet.insert(getUSRForDecl(CtorDecl));
+    // Add template constructor decls, they are not in ctors() unfortunately.
+    if (RecordDecl->hasUserDeclaredConstructor())
+      for (const auto *D : RecordDecl->decls())
+        if (const auto *FTD = dyn_cast<FunctionTemplateDecl>(D))
+          if (const auto *Ctor =
+                  dyn_cast<CXXConstructorDecl>(FTD->getTemplatedDecl()))
+            USRSet.insert(getUSRForDecl(Ctor));
 
     USRSet.insert(getUSRForDecl(RecordDecl->getDestructor()));
     USRSet.insert(getUSRForDecl(RecordDecl));
   }
 
   void addUSRsOfOverridenFunctions(const CXXMethodDecl *MethodDecl) {
     USRSet.insert(getUSRForDecl(MethodDecl));
     // Recursively visit each OverridenMethod.

clang/test/clang-rename/Ctor.cpp

 class Foo {                   // CHECK: class Bar {
 public:
   Foo();    /* Test 1 */      // CHECK: Bar();
 };
 
 Foo::Foo()  /* Test 2 */ {}   // CHECK: Bar::Bar()  /* Test 2 */ {}
 
+
+class Foo2 { /* Test 3 */     // CHECK: class Bar2 {
+public:
+  template <typename T>
+  Foo2();                     // CHECK: Bar2();
+
+  template <typename T>
+  Foo2(Foo2 &);               // CHECK: Bar2(Bar2 &);
+};
+
+
 // Test 1.
 // RUN: clang-rename -offset=62 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
 // Test 2.
 // RUN: clang-rename -offset=116 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
+// Test 3.
+// RUN: clang-rename -offset=187 -new-name=Bar2 %s -- | sed 's,//.*,,' | FileCheck %s
 
 // To find offsets after modifying the file, use:
 //   grep -Ubo 'Foo.*' <file>