Changeset 180690 in webkit for trunk/Source/JavaScriptCore/heap/Heap.h

Timestamp:

Feb 26, 2015, 11:44:08 AM (11 years ago)

Author:

[email protected]

Message:

Rolling out r180602, r180608, r180613, r180617, r180671.
<​https://webkit.org/b/141990>

Not reviewed.

The r180602 solution does result in more work for GC when worker
threads are in use. Filip is uncomfortable with that.
The EFL and GTK ports also seem to be unhappy with this change.
Rolling out while we investigate.

Source/JavaScriptCore:

• heap/Heap.cpp:

(JSC::Heap::Heap):
(JSC::Heap::gatherStackRoots):
(JSC::Heap::machineThreads): Deleted.

• heap/Heap.h:

(JSC::Heap::machineThreads):

• heap/MachineStackMarker.cpp:

(JSC::MachineThreads::MachineThreads):
(JSC::MachineThreads::~MachineThreads):
(JSC::MachineThreads::addCurrentThread):

• heap/MachineStackMarker.h:
• runtime/JSLock.cpp:

(JSC::JSLock::didAcquireLock):

Source/WebCore:

• bindings/js/JSDOMWindowBase.cpp:

(WebCore::JSDOMWindowBase::commonVM):

LayoutTests:

• platform/efl/TestExpectations:

File:

• trunk/Source/JavaScriptCore/heap/Heap.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -120 +120 @@
     VM* vm() const { return m_vm; }
     MarkedSpace& objectSpace() { return m_objectSpace; }
-    JS_EXPORT_PRIVATE static MachineThreads& machineThreads();
+    MachineThreads& machineThreads() { return m_machineThreads; }
 
     const SlotVisitor& slotVisitor() const { return m_slotVisitor; }
@@ -356 +356 @@
     std::unique_ptr<HashSet<MarkedArgumentBuffer*>> m_markListSet;
 
+    MachineThreads m_machineThreads;
+    
     GCThreadSharedData m_sharedData;
     SlotVisitor m_slotVisitor;