[clang-rename] fix bug with initializer lists

[omtcyfz]

Summary

clang-rename is currently not able to find a symbol in initializer list. This patch is a fix of that bug.

[alexfh]

LG with a nit.

clang-rename/USRFinder.cpp

100 ↗

(On Diff #66915)

It might be not clear from the context what auto means here, I'd use the explicit type.

[alexfh]

Wait, please add a test.

[omtcyfz]

Do these symbolic pointers in test seem reasonable?

[alexfh]

In D23193#508563, @omtcyfz wrote:

Do these symbolic pointers in test seem reasonable?

Yes, kind of. I'd change these to C-style comments, place them on the same line with the interesting identifier (probably, right after the identifier), and document a generic way of finding the offset using grep -Ubo 'Foo.*' or whatever grep flags are needed.

For example:

$ cat /tmp/a.h 
#include <string>

struct Foo /* test 1 */ {
  Foo /* test 2 */ (const std::string &s);
  std::string s;
};

// Test 1.
// RUN: ..... -offset=26 ...
// Test2.
// RUN: ..... -offset=47 ...

// To find offsets after modifying the file, use:
//   grep -Ubo 'Foo.*' <file>
$ grep -Ubo 'Foo.*' /tmp/a.h 
26:Foo /* test 1 */ {
47:Foo /* test 2 */ (const std::string &s);
255:Foo.*' <file>

[omtcyfz]

Added more info to the test.

[alexfh]

The test is fine now. Looks good once the other comment is addressed.

[omtcyfz]

auto -> SourceLocation

clang-tools-extra/trunk/clang-rename/USRFinder.cpp

if (const auto *TemplateSpecType =
             dyn_cast<TemplateSpecializationType>(Loc.getType())) {
       return setResult(TemplateSpecType->getTemplateName().getAsTemplateDecl(),
                        TypeBeginLoc, TypeEndLoc);
     }
     return setResult(Loc.getType()->getAsCXXRecordDecl(), TypeBeginLoc,
                      TypeEndLoc);
   }
 
+  bool VisitCXXConstructorDecl(clang::CXXConstructorDecl *ConstructorDecl) {
+    for (auto &Initializer : ConstructorDecl->inits()) {
+      if (Initializer->getSourceOrder() == -1) {
+        // Ignore implicit initializers.
+        continue;
+      }
+      if (const clang::FieldDecl *FieldDecl = Initializer->getMember()) {
+        const SourceLocation InitBeginLoc = Initializer->getSourceLocation(),
+                             InitEndLoc = Lexer::getLocForEndOfToken(
+                                 InitBeginLoc, 0, Context.getSourceManager(),
+                                 Context.getLangOpts());
+        if (!setResult(FieldDecl, InitBeginLoc, InitEndLoc)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
   // Other:
 
   const NamedDecl *getNamedDecl() { return Result; }
 
   // \brief Determines if a namespace qualifier contains the point.
   // \returns false on success and sets Result.
   void handleNestedNameSpecifierLoc(NestedNameSpecifierLoc NameLoc) {
     while (NameLoc) {

clang-tools-extra/trunk/clang-rename/USRLocFinder.cpp

public:
   // Declaration visitors:
 
   bool VisitCXXConstructorDecl(clang::CXXConstructorDecl *ConstructorDecl) {
     for (auto &Initializer : ConstructorDecl->inits()) {
       if (Initializer->getSourceOrder() == -1) {
         // Ignore implicit initializers.
         continue;
       }
-      if (const clang::FieldDecl *FieldDecl = Initializer->getAnyMember()) {
+      if (const clang::FieldDecl *FieldDecl = Initializer->getMember()) {
         if (USRSet.find(getUSRForDecl(FieldDecl)) != USRSet.end()) {
-          // The initializer refers to a field that is to be renamed.
-          SourceLocation Location = Initializer->getSourceLocation();
-          StringRef TokenName = Lexer::getSourceText(
-              CharSourceRange::getTokenRange(Location),
-              Context.getSourceManager(), Context.getLangOpts());
-          if (TokenName == PrevName) {
-            // The token of the source location we find actually has the old
-            // name.
-            LocationsFound.push_back(Initializer->getSourceLocation());
-          }
-        }
-      }
-    }
     return true;
   }
 
   bool VisitNamedDecl(const NamedDecl *Decl) {
     if (USRSet.find(getUSRForDecl(Decl)) != USRSet.end()) {
       checkAndAddLocation(Decl->getLocation());
     }
     return true;

clang-tools-extra/trunk/test/clang-rename/Field.cpp

-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=148 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
-
 class Baz {
-  int Foo;              // CHECK: Bar;
+  int Foo; /* Test 1 */ // CHECK: int Bar;
 public:
   Baz();
 };
 
-Baz::Baz() : Foo(0) {}  // CHECK: Baz::Baz() : Bar(0) {}
+Baz::Baz() : Foo(0) /* Test 2 */ {}  // CHECK: Baz::Baz() : Bar(0)
+
+// Test 1.
+// RUN: clang-rename -offset=18 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
+// Test 2.
+// RUN: clang-rename -offset=89 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
 
-// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing
-// this file.
+// To find offsets after modifying the file, use:
+//   grep -Ubo 'Foo.*' <file>