Update from https://crrev.com/318214

tools/clang/blink_gc_plugin/RecordInfo.cpp

 // Copyright 2014 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.
 
 #include "Config.h"
 #include "RecordInfo.h"
 
 using namespace clang;
 using std::string;
 
@@ skipping 408 matching lines @@
   fields_need_tracing_ = fields_status;
   return fields;
 }
 
 void RecordInfo::DetermineTracingMethods() {
   if (determined_trace_methods_)
     return;
   determined_trace_methods_ = true;
   if (Config::IsGCBase(name_))
     return;
-  CXXMethodDecl* trace = 0;
-  CXXMethodDecl* traceAfterDispatch = 0;
-  bool isTraceAfterDispatch;
-  bool hasAdjustAndMark = false;
-  bool hasIsHeapObjectAlive = false;
+  CXXMethodDecl* trace = nullptr;
+  CXXMethodDecl* trace_after_dispatch = nullptr;
+  bool has_adjust_and_mark = false;
+  bool has_is_heap_object_alive = false;
   for (CXXRecordDecl::method_iterator it = record_->method_begin();
        it != record_->method_end();
        ++it) {
-    if (Config::IsTraceMethod(*it, &isTraceAfterDispatch)) {
-      if (isTraceAfterDispatch) {
-        traceAfterDispatch = *it;
-      } else {
+    switch (Config::GetTraceMethodType(*it)) {
+      case Config::TRACE_METHOD:
         trace = *it;
-      }
-    } else if (it->getNameAsString() == kFinalizeName) {
-      finalize_dispatch_method_ = *it;
-    } else if (it->getNameAsString() == kAdjustAndMarkName) {
-      hasAdjustAndMark = true;
-    } else if (it->getNameAsString() == kIsHeapObjectAliveName) {
-      hasIsHeapObjectAlive = true;
+        break;
+      case Config::TRACE_AFTER_DISPATCH_METHOD:
+        trace_after_dispatch = *it;
+        break;
+      case Config::TRACE_IMPL_METHOD:
+      case Config::TRACE_AFTER_DISPATCH_IMPL_METHOD:
+        break;
+      case Config::NOT_TRACE_METHOD:
+        if (it->getNameAsString() == kFinalizeName) {
+          finalize_dispatch_method_ = *it;
+        } else if (it->getNameAsString() == kAdjustAndMarkName) {
+          has_adjust_and_mark = true;
+        } else if (it->getNameAsString() == kIsHeapObjectAliveName) {
+          has_is_heap_object_alive = true;
+        }
+        break;
     }
   }
   // Record if class defines the two GCMixin methods.
   has_gc_mixin_methods_ =
-      hasAdjustAndMark && hasIsHeapObjectAlive ? kTrue : kFalse;
-  if (traceAfterDispatch) {
-    trace_method_ = traceAfterDispatch;
+      has_adjust_and_mark && has_is_heap_object_alive ? kTrue : kFalse;
+  if (trace_after_dispatch) {
+    trace_method_ = trace_after_dispatch;
     trace_dispatch_method_ = trace;
   } else {
     // TODO: Can we never have a dispatch method called trace without the same
     // class defining a traceAfterDispatch method?
     trace_method_ = trace;
-    trace_dispatch_method_ = 0;
+    trace_dispatch_method_ = nullptr;
   }
   if (trace_dispatch_method_ && finalize_dispatch_method_)
     return;
   // If this class does not define dispatching methods inherit them.
   for (Bases::iterator it = GetBases().begin(); it != GetBases().end(); ++it) {
     // TODO: Does it make sense to inherit multiple dispatch methods?
     if (CXXMethodDecl* dispatch = it->second.info()->GetTraceDispatchMethod()) {
       assert(!trace_dispatch_method_ && "Multiple trace dispatching methods");
       trace_dispatch_method_ = dispatch;
     }
@@ skipping 153 matching lines @@
         edge->members().push_back(member);
       }
       // TODO: Handle the case where we fail to create an edge (eg, if the
       // argument is a primitive type or just not fully known yet).
     }
     return edge;
   }
 
   return new Value(info);
 }