Author: vmiklos Date: Wed May 11 03:08:07 2016 New Revision: 269161 URL: http://llvm.org/viewvc/llvm-project?rev=269161&view=rev Log: clang-rename: fix renaming of field with implicit initializers
The last check failed as Cla::Cla() was rewritten to Cla::hector(). Reviewers: cfe-commits, klimek Differential Revision: http://reviews.llvm.org/D20150 Added: clang-tools-extra/trunk/test/clang-rename/CtorInitializerTest.cpp Modified: clang-tools-extra/trunk/clang-rename/USRLocFinder.cpp Modified: clang-tools-extra/trunk/clang-rename/USRLocFinder.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-rename/USRLocFinder.cpp?rev=269161&r1=269160&r2=269161&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-rename/USRLocFinder.cpp (original) +++ clang-tools-extra/trunk/clang-rename/USRLocFinder.cpp Wed May 11 03:08:07 2016 @@ -60,6 +60,11 @@ public: 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. Added: clang-tools-extra/trunk/test/clang-rename/CtorInitializerTest.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/CtorInitializerTest.cpp?rev=269161&view=auto ============================================================================== --- clang-tools-extra/trunk/test/clang-rename/CtorInitializerTest.cpp (added) +++ clang-tools-extra/trunk/test/clang-rename/CtorInitializerTest.cpp Wed May 11 03:08:07 2016 @@ -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' <file> to get the correct offset of foo when changing +// this file. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits