From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/jit/JITWriteBarrier.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/JavaScriptCore/jit/JITWriteBarrier.h') diff --git a/Source/JavaScriptCore/jit/JITWriteBarrier.h b/Source/JavaScriptCore/jit/JITWriteBarrier.h index 9da1ea782..b410ecadb 100644 --- a/Source/JavaScriptCore/jit/JITWriteBarrier.h +++ b/Source/JavaScriptCore/jit/JITWriteBarrier.h @@ -31,6 +31,7 @@ #include "MacroAssembler.h" #include "SlotVisitor.h" #include "UnusedPointer.h" +#include "VM.h" #include "WriteBarrier.h" namespace JSC { @@ -42,8 +43,7 @@ class VM; #define JITWriteBarrierFlag ((void*)2) class JITWriteBarrierBase { public: - typedef void* (JITWriteBarrierBase::*UnspecifiedBoolType); - operator UnspecifiedBoolType*() const { return get() ? reinterpret_cast(1) : 0; } + explicit operator bool() const { return get(); } bool operator!() const { return !get(); } void setFlagOnBarrier() @@ -77,9 +77,9 @@ protected: { } - void set(VM&, CodeLocationDataLabelPtr location, JSCell* owner, JSCell* value) + void set(VM& vm, CodeLocationDataLabelPtr location, JSCell* owner, JSCell* value) { - Heap::writeBarrier(owner, value); + vm.heap.writeBarrier(owner, value); m_location = location; ASSERT(((!!m_location) && m_location.executableAddress() != JITWriteBarrierFlag) || (location.executableAddress() == m_location.executableAddress())); MacroAssembler::repatchPointer(m_location, value); @@ -137,7 +137,7 @@ public: template inline void SlotVisitor::append(JITWriteBarrier* slot) { - internalAppend(slot->get()); + internalAppend(0, slot->get()); } } -- cgit v1.2.1