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

[vmiklos]

Summary

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

[klimek]

clang-rename/USRLocFinder.cpp

106–113

Don't we just always want to do that?
Location = Decl->getASTContext().getSourceManager().getSpellingLoc(Expr->getMemberLoc());
should always work.

[vmiklos]

Done.

[klimek]

lg

clang-rename/USRLocFinder.cpp

bool VisitDeclRefExpr(const DeclRefExpr *Expr) {
     }
 
     return true;
   }
 
   bool VisitMemberExpr(const MemberExpr *Expr) {
     const auto *Decl = Expr->getFoundDecl().getDecl();
     if (getUSRForDecl(Decl) == USR) {
-      LocationsFound.push_back(Expr->getMemberLoc());
+      SourceLocation Location = Expr->getMemberLoc();
+      if (Location.isMacroID()) {
+        // The location is expanded from a macro, look up the original spelling
+        // location.
+        const ASTContext &Context = Decl->getASTContext();
+        Location = Context.getSourceManager().getSpellingLoc(Location);
+      }
+      LocationsFound.push_back(Location);
     }
     return true;
   }
 
   // Non-visitors:
 
   // \brief Returns a list of unique locations. Duplicate or overlapping
   // locations are erroneous and should be reported!

test/clang-rename/MemberExprMacro.cpp

+// 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.