Look at canonical decl, when deciding whether to rename or not.

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 70 matching lines @@
   return Node.isInstance();
 }
 
 AST_MATCHER_P(clang::FunctionTemplateDecl,
               templatedDecl,
               clang::ast_matchers::internal::Matcher<clang::FunctionDecl>,
               InnerMatcher) {
   return InnerMatcher.matches(*Node.getTemplatedDecl(), Finder, Builder);
 }
 
+AST_MATCHER_P(clang::Decl,
+              hasCanonicalDecl,
+              clang::ast_matchers::internal::Matcher<clang::Decl>,
+              InnerMatcher) {
+  return InnerMatcher.matches(*Node.getCanonicalDecl(), Finder, Builder);
+}
+
 // Matches a CXXMethodDecl of a method declared via MOCK_METHODx macro if such
 // method mocks a method matched by the InnerMatcher.  For example if "foo"
 // matcher matches "interfaceMethod", then mocksMethod(foo()) will match
 // "gmock_interfaceMethod" declared by MOCK_METHOD_x(interfaceMethod).
 AST_MATCHER_P(clang::CXXMethodDecl,
               mocksMethod,
               clang::ast_matchers::internal::Matcher<clang::CXXMethodDecl>,
               InnerMatcher) {
   if (!Node.getDeclName().isIdentifier())
     return false;
@@ skipping 1331 matching lines @@
   //   void WTF::function() {}
   //   void WTF::Class::method() {}
   // matches |WTF::function| and |WTF::Class::method| decls.
   auto decl_has_qualifier_to_blink_namespace =
       declaratorDecl(has(nestedNameSpecifier(
           hasTopLevelPrefix(specifiesNamespace(blink_namespace_decl)))));
 
   auto in_blink_namespace = decl(
       anyOf(decl_under_blink_namespace, decl_has_qualifier_to_blink_namespace,
             hasAncestor(decl_has_qualifier_to_blink_namespace)),
-      unless(isExpansionInFileMatching(kGeneratedFileRegex)));
+      unless(hasCanonicalDecl(isExpansionInFileMatching(kGeneratedFileRegex))));

[Łukasz Anforowicz, 2017/01/21 01:04:00]

These are the only real changes from patchset #1.  The other changes are caused
by an accidental rebasing. :-P

 
   // Field, variable, and enum declarations ========
   // Given
   //   int x;
   //   struct S {
   //     int y;
   //     enum { VALUE };
   //   };
   // matches |x|, |y|, and |VALUE|.
   auto field_decl_matcher = id("decl", fieldDecl(in_blink_namespace));
@@ skipping 352 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;
 }