[clang-rename] fix bug with initializer lists
Clang-rename is currently not able to find a symbol in initializer list. This
patch fixes described issue.
Reviewers: alexfh
Differential Revision: https://reviews.llvm.org/D23193
llvm-svn: 278099
diff --git a/clang-tools-extra/clang-rename/USRLocFinder.cpp b/clang-tools-extra/clang-rename/USRLocFinder.cpp
index d3c64ba..7a491d0 100644
--- a/clang-tools-extra/clang-rename/USRLocFinder.cpp
+++ b/clang-tools-extra/clang-rename/USRLocFinder.cpp
@@ -48,18 +48,9 @@
// 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());
- }
+ LocationsFound.push_back(Initializer->getSourceLocation());
}
}
}