Index: clang-rename/USRLocFinder.cpp =================================================================== --- clang-rename/USRLocFinder.cpp +++ clang-rename/USRLocFinder.cpp @@ -60,6 +60,11 @@ 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. Index: test/clang-rename/CtorInitializerTest.cpp =================================================================== --- /dev/null +++ test/clang-rename/CtorInitializerTest.cpp @@ -0,0 +1,20 @@ +// 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' to get the correct offset of foo when changing +// this file.