| Index: tools/clang/blink_gc_plugin/Config.h
|
| diff --git a/tools/clang/blink_gc_plugin/Config.h b/tools/clang/blink_gc_plugin/Config.h
|
| index 2ab933f382dd6d1eb4f336ad4c3ceae00647904a..f0c4aeca33bacd8a434dd0048bffe842225abb1d 100644
|
| --- a/tools/clang/blink_gc_plugin/Config.h
|
| +++ b/tools/clang/blink_gc_plugin/Config.h
|
| @@ -20,10 +20,8 @@
|
| extern const char kNewOperatorName[];
|
| extern const char* kCreateName;
|
| extern const char* kTraceName;
|
| -extern const char* kTraceImplName;
|
| extern const char* kFinalizeName;
|
| extern const char* kTraceAfterDispatchName;
|
| -extern const char* kTraceAfterDispatchImplName;
|
| extern const char* kRegisterWeakMembersName;
|
| extern const char kHeapAllocatorName[];
|
| extern const char kTraceIfNeededName[];
|
| @@ -219,8 +217,6 @@ class Config {
|
| NOT_TRACE_METHOD,
|
| TRACE_METHOD,
|
| TRACE_AFTER_DISPATCH_METHOD,
|
| - TRACE_IMPL_METHOD,
|
| - TRACE_AFTER_DISPATCH_IMPL_METHOD
|
| };
|
|
|
| static TraceMethodType GetTraceMethodType(const clang::FunctionDecl* method) {
|
| @@ -228,15 +224,11 @@ class Config {
|
| return NOT_TRACE_METHOD;
|
|
|
| const std::string& name = method->getNameAsString();
|
| - if (name != kTraceName && name != kTraceAfterDispatchName &&
|
| - name != kTraceImplName && name != kTraceAfterDispatchImplName)
|
| + if (name != kTraceName && name != kTraceAfterDispatchName)
|
| return NOT_TRACE_METHOD;
|
|
|
| const clang::QualType& formal_type = method->getParamDecl(0)->getType();
|
| - if (name == kTraceImplName || name == kTraceAfterDispatchImplName) {
|
| - if (!IsVisitorDispatcherType(formal_type))
|
| - return NOT_TRACE_METHOD;
|
| - } else if (!IsVisitorPtrType(formal_type)) {
|
| + if (!IsVisitorPtrType(formal_type)) {
|
| return NOT_TRACE_METHOD;
|
| }
|
|
|
| @@ -244,10 +236,6 @@ class Config {
|
| return TRACE_METHOD;
|
| if (name == kTraceAfterDispatchName)
|
| return TRACE_AFTER_DISPATCH_METHOD;
|
| - if (name == kTraceImplName)
|
| - return TRACE_IMPL_METHOD;
|
| - if (name == kTraceAfterDispatchImplName)
|
| - return TRACE_AFTER_DISPATCH_IMPL_METHOD;
|
|
|
| assert(false && "Should not reach here");
|
| return NOT_TRACE_METHOD;
|
| @@ -257,10 +245,6 @@ class Config {
|
| return GetTraceMethodType(method) != NOT_TRACE_METHOD;
|
| }
|
|
|
| - static bool IsTraceImplName(const std::string& name) {
|
| - return name == kTraceImplName || name == kTraceAfterDispatchImplName;
|
| - }
|
| -
|
| static bool StartsWith(const std::string& str, const std::string& prefix) {
|
| if (prefix.size() > str.size())
|
| return false;
|
|
|