Thread-local weak processing should just use a global weak callback stacks

third_party/WebKit/Source/platform/heap/Heap.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 292 matching lines @@
 }
 
 void ThreadHeap::pushGlobalWeakCallback(void** cell, WeakCallback callback) {
   ASSERT(ThreadState::current()->isInGC());
 
   CallbackStack::Item* slot = m_globalWeakCallbackStack->allocateEntry();
   *slot = CallbackStack::Item(cell, callback);
 }
 
 void ThreadHeap::pushThreadLocalWeakCallback(void* closure,
                                              void* object,

[haraken, 2017/02/13 04:17:40]

I'll remove the unused parameter and methods in a follow-up.

[sof, 2017/02/13 06:45:00]

ok, needed as this is now identical to the above puseGlobalWeakCallback().

                                              WeakCallback callback) {
   ASSERT(ThreadState::current()->isInGC());
 
-  ThreadState* state = pageFromObject(object)->arena()->getThreadState();
-  state->pushThreadLocalWeakCallback(closure, callback);
+  CallbackStack::Item* slot = m_globalWeakCallbackStack->allocateEntry();
+  *slot = CallbackStack::Item(closure, callback);
 }
 
 bool ThreadHeap::popAndInvokeGlobalWeakCallback(Visitor* visitor) {
   if (CallbackStack::Item* item = m_globalWeakCallbackStack->pop()) {
     item->call(visitor);
     return true;
   }
   return false;
 }
 
@@ skipping 270 matching lines @@
   ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize());
 
   m_stats.reset();
   for (ThreadState* state : m_threads)
     state->resetHeapCounters();
 }
 
 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr;
 
 }  // namespace blink