Changeset 163556 in webkit for trunk/Source/JavaScriptCore/jit/JITWriteBarrier.h

Timestamp:

Feb 6, 2014, 12:22:43 PM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r163542.
​http://trac.webkit.org/changeset/163542
​https://bugs.webkit.org/show_bug.cgi?id=128324

Caused many assertion failures (Requested by ap on #webkit).

Source/JavaScriptCore:

• GNUmakefile.list.am:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• heap/CopyWriteBarrier.h:

(JSC::CopyWriteBarrier::set):

• heap/Heap.cpp:

(JSC::Heap::writeBarrier):

• heap/Heap.h:

(JSC::Heap::writeBarrier):

• jit/JITOperations.cpp:
• jit/JITWriteBarrier.h:

(JSC::JITWriteBarrierBase::set):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::llint_write_barrier_slow):

• runtime/Arguments.h:
• runtime/JSWeakMap.cpp:
• runtime/MapData.cpp:

(JSC::MapData::ensureSpaceForAppend):

• runtime/PropertyTable.cpp:

(JSC::PropertyTable::PropertyTable):

• runtime/Structure.h:
• runtime/WriteBarrier.h:

(JSC::WriteBarrierBase::set):
(JSC::WriteBarrierBase::setMayBeNull):
(JSC::WriteBarrierBase::setEarlyValue):
(JSC::WriteBarrierBase<Unknown>::set):

• runtime/WriteBarrierInlines.h: Removed.

Source/WebCore:

• bindings/js/JSEventListener.cpp:

(WebCore::JSEventListener::JSEventListener):

• bindings/js/JSEventListener.h:

(WebCore::JSEventListener::jsFunction):

File:

• trunk/Source/JavaScriptCore/jit/JITWriteBarrier.h (modified) (1 diff)

trunk/Source/JavaScriptCore/jit/JITWriteBarrier.h

@@ -78 +78 @@
     }
 
-    void set(VM& vm, CodeLocationDataLabelPtr location, JSCell* owner, JSCell* value)
+    void set(VM&, CodeLocationDataLabelPtr location, JSCell* owner, JSCell* value)
     {
-        vm.heap.writeBarrier(owner, value);
+        Heap::writeBarrier(owner, value);
         m_location = location;
         ASSERT(((!!m_location) && m_location.executableAddress() != JITWriteBarrierFlag) || (location.executableAddress() == m_location.executableAddress()));