rewrite_to_chrome_style: tweak macro ignoring logic.

tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Changes Blink-style names to Chrome-style names. Currently transforms:
 //   fields:
 //     int m_operationCount => int operation_count_
 //   variables (including parameters):
 //     int mySuperVariable => int my_super_variable
 //   constants:
@@ skipping 189 matching lines @@
 
   return true;
 }
 
 template <typename Type>
 struct TargetNodeTraits;
 
 template <>
 struct TargetNodeTraits<clang::NamedDecl> {
   static const char kName[];
-  static clang::CharSourceRange GetRange(const clang::NamedDecl& decl) {
-    return clang::CharSourceRange::getTokenRange(decl.getLocation());
+  static clang::SourceLocation GetLoc(const clang::NamedDecl& decl) {
+    return decl.getLocation();
   }
 };
 const char TargetNodeTraits<clang::NamedDecl>::kName[] = "decl";
 
 template <>
 struct TargetNodeTraits<clang::MemberExpr> {
   static const char kName[];
-  static clang::CharSourceRange GetRange(const clang::MemberExpr& expr) {
-    return clang::CharSourceRange::getTokenRange(expr.getMemberLoc());
+  static clang::SourceLocation GetLoc(const clang::MemberExpr& expr) {
+    return expr.getMemberLoc();
   }
 };
 const char TargetNodeTraits<clang::MemberExpr>::kName[] = "expr";
 
 template <>
 struct TargetNodeTraits<clang::DeclRefExpr> {
   static const char kName[];
-  static clang::CharSourceRange GetRange(const clang::DeclRefExpr& expr) {
-    return clang::CharSourceRange::getTokenRange(expr.getLocation());
+  static clang::SourceLocation GetLoc(const clang::DeclRefExpr& expr) {
+    return expr.getLocation();
   }
 };
 const char TargetNodeTraits<clang::DeclRefExpr>::kName[] = "expr";
 
 template <>
 struct TargetNodeTraits<clang::CXXCtorInitializer> {
   static const char kName[];
-  static clang::CharSourceRange GetRange(
-      const clang::CXXCtorInitializer& init) {
+  static clang::SourceLocation GetLoc(const clang::CXXCtorInitializer& init) {
     assert(init.isWritten());
-    return clang::CharSourceRange::getTokenRange(init.getSourceLocation());
+    return init.getSourceLocation();
   }
 };
 const char TargetNodeTraits<clang::CXXCtorInitializer>::kName[] = "initializer";
 
 template <typename DeclNode, typename TargetNode>
 class RewriterBase : public MatchFinder::MatchCallback {
  public:
   explicit RewriterBase(Replacements* replacements)
       : replacements_(replacements) {}
 
   void run(const MatchFinder::MatchResult& result) override {
-    std::string new_name;
     const DeclNode* decl = result.Nodes.getNodeAs<DeclNode>("decl");
-    clang::ASTContext* context = result.Context;
+    // If the decl originates inside a macro, just skip it completely.
+    clang::SourceLocation decl_loc =
+        TargetNodeTraits<clang::NamedDecl>::GetLoc(*decl);
+    if (decl_loc.isMacroID())
+      return;
     // If false, there's no name to be renamed.
     if (!decl->getIdentifier())
       return;
     // If false, the name was not suitable for renaming.
+    clang::ASTContext* context = result.Context;
+    std::string new_name;
     if (!GetNameForDecl(*decl, *context, new_name))
       return;
     llvm::StringRef old_name = decl->getName();
     if (old_name == new_name)
       return;
-    clang::CharSourceRange range = TargetNodeTraits<TargetNode>::GetRange(
+    clang::SourceLocation loc = TargetNodeTraits<TargetNode>::GetLoc(
         *result.Nodes.getNodeAs<TargetNode>(
             TargetNodeTraits<TargetNode>::kName));
-    if (range.getBegin().isMacroID() || range.getEnd().isMacroID())
-      return;
+    clang::CharSourceRange range = clang::CharSourceRange::getTokenRange(loc);
     replacements_->emplace(*result.SourceManager, range, new_name);
     replacement_names_.emplace(old_name.str(), std::move(new_name));
   }
 
   const std::unordered_map<std::string, std::string>& replacement_names()
       const {
     return replacement_names_;
   }
 
  private:
@@ skipping 318 matching lines @@
   for (const auto& r : replacements) {
     std::string replacement_text = r.getReplacementText().str();
     std::replace(replacement_text.begin(), replacement_text.end(), '\n', '\0');
     llvm::outs() << "r:::" << r.getFilePath() << ":::" << r.getOffset()
                  << ":::" << r.getLength() << ":::" << replacement_text << "\n";
   }
   llvm::outs() << "==== END EDITS ====\n";
 
   return 0;
 }