clang-rename: fix renaming of field with implicit initializers

[vmiklos]

Summary

The last check failed as Cla::Cla() was rewritten to Cla::hector().

[klimek]

LG

clang-rename/USRLocFinder.cpp

64

Add a comment like:
// The source location of implicit initializers is the constructor declaration.

Also: should we add a check that the token of the source location we find actually has the old name?

[vmiklos]

clang-rename/USRLocFinder.cpp

64

I don't know off the top of my head a situation where this is needed, but sure, sounds like a useful safety check. I'll have a look.

[vmiklos]

Hi,

Also: should we add a check that the token of the source location we find actually has the old name?

Hmm, how do I get the token at a specific SourceLocation? The best I found so far is SourceManager::getBuffer(), but that looks more like looking up raw bytes from the source file at a location, not a token.

Thanks,

Miklos

clang-rename/USRLocFinder.cpp

if (RecordDecl) {
       }
     }
     return true;
   }
 
   bool VisitCXXConstructorDecl(clang::CXXConstructorDecl *ConstructorDecl) {
     for (clang::CXXConstructorDecl::init_const_iterator it = ConstructorDecl->init_begin(); it != ConstructorDecl->init_end(); ++it) {
       const clang::CXXCtorInitializer* Initializer = *it;
+      if (Initializer->getSourceOrder() == -1) {
+        // Ignore implicit initializers.
+        continue;
+      }
+
       if (const clang::FieldDecl *FieldDecl = Initializer->getAnyMember()) {
         if (getUSRForDecl(FieldDecl) == USR) {
           // The initializer refers to a field that is to be renamed.
           LocationsFound.push_back(Initializer->getSourceLocation());
         }
       }
     }
     return true;

test/clang-rename/CtorInitializerTest.cpp

+// RUN: cat %s > %t.cpp
+// RUN: clang-rename -offset=162 -new-name=hector %t.cpp -i --
+// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+class A
+{
+};
+
+class Cla
+{
+  A foo; // CHECK: hector;
+public:
+  Cla();
+};
+
+Cla::Cla() // CHECK: Cla::Cla()
+{
+}
+
+// Use grep -FUbo 'foo' <file> to get the correct offset of foo when changing
+// this file.