rewrite_to_chrome_style: Blacklisted methods are not blink methods!

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 69 matching lines @@
 // getAnyMember() will return a FieldDecl which we can match against.
 AST_MATCHER_P(clang::CXXCtorInitializer,
               forAnyField,
               clang::ast_matchers::internal::Matcher<clang::FieldDecl>,
               InnerMatcher) {
   const clang::FieldDecl* NodeAsDecl = Node.getAnyMember();
   return (NodeAsDecl != nullptr &&
           InnerMatcher.matches(*NodeAsDecl, Finder, Builder));
 }
 
+bool IsBlacklistedMethod(const clang::CXXMethodDecl& decl) {
+  if (decl.isStatic())
+    return false;
+
+  clang::StringRef name = decl.getName();
+
+  // These methods should never be renamed.
+  static const char* kBlacklistMethods[] = {"trace", "lock", "unlock",
+                                            "try_lock"};
+  for (const auto& b : kBlacklistMethods) {
+    if (name == b)
+      return true;
+  }
+
+  // Iterator methods shouldn't be renamed to work with stl and range-for
+  // loops.
+  std::string ret_type = decl.getReturnType().getAsString();
+  if (ret_type.find("iterator") == std::string::npos &&
+      ret_type.find("Iterator") == std::string::npos)
+    return false;
+  static const char* kIteratorBlacklist[] = {"begin", "end", "rbegin", "rend"};
+  for (const auto& b : kIteratorBlacklist) {
+    if (name == b)
+      return true;
+  }
+
+  return false;
+}
+
 bool IsDeclContextInBlinkOrWTF(const clang::DeclContext* decl_context,
                                const clang::SourceLocation& location,
                                clang::SourceManager& source_manager,
                                bool blink,
                                bool wtf) {
   assert(blink || wtf);  // Else, what's the point?
 
   // Generated stuff is not considered in blink for renaming since the tool will
   // not rename them.
   auto expansion_loc = source_manager.getExpansionLoc(location);
@@ skipping 24 matching lines @@
   return false;
 }
 
 // A method is from Blink if it is from the Blink namespace or overrides a
 // method from the Blink namespace.
 bool IsBlinkOrWTFMethod(const clang::CXXMethodDecl& decl,
                         clang::SourceManager& source_manager) {
   bool overrides_blink = false;
   bool overrides_non_blink = false;
 
+  // Blacklisted methods are not considered to be in blink so that they will
+  // never be rewritten.
+  if (IsBlacklistedMethod(decl))
+    return false;
+
   for (auto it = decl.begin_overridden_methods();
        it != decl.end_overridden_methods(); ++it) {
     if (IsBlinkOrWTFMethod(**it, source_manager))
       overrides_blink = true;
     else
       overrides_non_blink = true;
   }
 
   // If this fires we have a class overriding a method from a class in blink,
   // and also overriding a method of the same name from a class not in blink,
@@ skipping 140 matching lines @@
   name += original_name;
   name[1] = clang::toUppercase(name[1]);
   return true;
 }
 
 bool GetNameForDecl(const clang::CXXMethodDecl& decl,
                     const clang::ASTContext& context,
                     clang::SourceManager& source_manager,
                     std::string& name) {
   StringRef original_name = decl.getName();
-
-  if (!decl.isStatic()) {
-    std::string ret_type = decl.getReturnType().getAsString();
-    if (ret_type.find("iterator") != std::string::npos ||
-        ret_type.find("Iterator") != std::string::npos) {
-      // Iterator methods shouldn't be renamed to work with stl and range-for
-      // loops.
-      static const char* kIteratorBlacklist[] = {"begin", "end", "rbegin",
-                                                 "rend"};
-      for (const auto& b : kIteratorBlacklist) {
-        if (original_name == b)
-          return false;
-      }
-    }
-
-    // Some methods shouldn't be renamed because reasons.
-    static const char* kBlacklist[] = {"trace", "lock", "unlock", "try_lock"};
-    for (const auto& b : kBlacklist) {
-      if (original_name == b)
-        return false;
-    }
-  }
-
-  name = decl.getName().str();
+  name = original_name.str();

[dcheng, 2016/03/10 23:57:42]

Nit: get rid of |original_name| local here.

[danakj, 2016/03/11 01:49:33]

Done.

   name[0] = clang::toUppercase(name[0]);
   return true;
 }
 
 bool GetNameForDecl(const clang::FieldDecl& decl,
                     const clang::ASTContext& context,
                     clang::SourceManager& source_manager,
                     std::string& name) {
   StringRef original_name = decl.getName();
   bool member_prefix = original_name.startswith(kBlinkFieldPrefix);
@@ skipping 463 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;
 }