[clang-rename] Fix and enable the failing TemplatedClassFunction test.

[ioeric]

lg

test/clang-rename/TemplatedClassFunction.cpp

8

Could you add a few more instantiations in the test case, e.g. A<double>, A<X>?

[hokein]

improve the code and add more tests.

lib/Tooling/Refactoring/Rename/USRFindingAction.cpp

std::vector<std::string> Find() {
     // Fill OverriddenMethods and PartialSpecs storages.
     TraverseDecl(Context.getTranslationUnitDecl());
     if (const auto *MethodDecl = dyn_cast<CXXMethodDecl>(FoundDecl)) {
       addUSRsOfOverridenFunctions(MethodDecl);
       for (const auto &OverriddenMethod : OverriddenMethods) {
         if (checkIfOverriddenFunctionAscends(OverriddenMethod))
           USRSet.insert(getUSRForDecl(OverriddenMethod));
       }
+
+      // If MethodDecl is an instantiated member function of a class template
+      // specialiazation, we also need to add the USR of the template member
+      // function from which MethodDecl is instantiated, otherwise the template
+      // member function would not be renamed.
+      if (const auto *FT = MethodDecl->getInstantiatedFromMemberFunction())
+        USRSet.insert(getUSRForDecl(FT));
     } else if (const auto *RecordDecl = dyn_cast<CXXRecordDecl>(FoundDecl)) {
       handleCXXRecordDecl(RecordDecl);
     } else if (const auto *TemplateDecl =
                    dyn_cast<ClassTemplateDecl>(FoundDecl)) {
       handleClassTemplateDecl(TemplateDecl);
     } else {
       USRSet.insert(getUSRForDecl(FoundDecl));
     }
     return std::vector<std::string>(USRSet.begin(), USRSet.end());
   }
 
+  bool shouldVisitTemplateInstantiations() const { return true; }
+
   bool VisitCXXMethodDecl(const CXXMethodDecl *MethodDecl) {
     if (MethodDecl->isVirtual())
       OverriddenMethods.push_back(MethodDecl);
+    // If FoundDecl is a template member function, all corresponding
+    // instantiated member functions should be included, otherwise only the
+    // template member function would be renamed.
+    if (MethodDecl->getInstantiatedFromMemberFunction() == FoundDecl)
+      USRSet.insert(getUSRForDecl(MethodDecl));
     return true;
   }
 
   bool VisitClassTemplatePartialSpecializationDecl(
       const ClassTemplatePartialSpecializationDecl *PartialSpec) {
     PartialSpecs.push_back(PartialSpec);
     return true;
   }

test/clang-rename/TemplatedClassFunction.cpp

 template <typename T>
 class A {
 public:
   void foo() /* Test 1 */ {}  // CHECK: void bar() /* Test 1 */ {}
 };
 
 int main(int argc, char **argv) {
   A<int> a;
-  a.foo();   /* Test 2 */     // CHECK: a.bar()   /* Test 2 */
+  a.foo();   /* Test 2 */     // CHECK: a.bar();   /* Test 2 */
   return 0;
 }
 
 // Test 1.
-// RUN: clang-refactor rename -offset=48 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
+// RUN: clang-rename -offset=48 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
 // Test 2.
-// RUN: clang-refactor rename -offset=162 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
-//
-// Currently unsupported test.
-// XFAIL: *
+// RUN: clang-rename -offset=162 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
 
 // To find offsets after modifying the file, use:
 //   grep -Ubo 'foo.*' <file>