maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-rename: fix renaming members when referenced as macro arguments 

The second check failed, FOO(C.X) wasn't renamed to FOO(C.Y).

Reviewers: klimek

Differential Revision: http://reviews.llvm.org/D20446

llvm-svn: 270204
This commit is contained in:
Miklos Vajna 2016-05-20 11:43:59 +00:00
parent c4a0dd49a3
commit ed28d41b1a
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang-tools-extra/clang-rename/USRLocFinder.cpp
View File

@ -103,7 +103,9 @@ public:
bool VisitMemberExpr(const MemberExpr *Expr) {
const auto *Decl = Expr->getFoundDecl().getDecl();
if (getUSRForDecl(Decl) == USR) {
LocationsFound.push_back(Expr->getMemberLoc());
const SourceManager &Manager = Decl->getASTContext().getSourceManager();
SourceLocation Location = Manager.getSpellingLoc(Expr->getMemberLoc());
LocationsFound.push_back(Location);
}
return true;
}

25
clang-tools-extra/test/clang-rename/MemberExprMacro.cpp Normal file
View File

@ -0,0 +1,25 @@
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=151 -new-name=Y %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class C
{
public:
int X;
};
int foo(int x)
{
return 0;
}
#define FOO(a) foo(a)
int main()
{
C C;
C.X = 1; // CHECK: C.Y
FOO(C.X); // CHECK: C.Y
int y = C.X; // CHECK: C.Y
}
// Use grep -FUbo 'C' <file> to get the correct offset of foo when changing
// this file.