diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp')
| -rw-r--r-- | Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp b/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp index 521e49751..f681dd847 100644 --- a/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp +++ b/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp @@ -29,20 +29,21 @@ #if ENABLE(JIT) #include "Heap.h" -#include "JSGlobalData.h" +#include "VM.h" +#include "Operations.h" #include "SlotVisitor.h" #include "Structure.h" namespace JSC { GCAwareJITStubRoutine::GCAwareJITStubRoutine( - const MacroAssemblerCodeRef& code, JSGlobalData& globalData, bool isClosureCall) + const MacroAssemblerCodeRef& code, VM& vm, bool isClosureCall) : JITStubRoutine(code) , m_mayBeExecuting(false) , m_isJettisoned(false) , m_isClosureCall(isClosureCall) { - globalData.heap.m_jitStubRoutines.add(this); + vm.heap.m_jitStubRoutines.add(this); } GCAwareJITStubRoutine::~GCAwareJITStubRoutine() { } @@ -59,7 +60,7 @@ void GCAwareJITStubRoutine::observeZeroRefCount() return; } - ASSERT(!m_refCount); + RELEASE_ASSERT(!m_refCount); m_isJettisoned = true; } @@ -78,10 +79,10 @@ void GCAwareJITStubRoutine::markRequiredObjectsInternal(SlotVisitor&) } MarkingGCAwareJITStubRoutineWithOneObject::MarkingGCAwareJITStubRoutineWithOneObject( - const MacroAssemblerCodeRef& code, JSGlobalData& globalData, const JSCell* owner, + const MacroAssemblerCodeRef& code, VM& vm, const JSCell* owner, JSCell* object) - : GCAwareJITStubRoutine(code, globalData) - , m_object(globalData, owner, object) + : GCAwareJITStubRoutine(code, vm) + , m_object(vm, owner, object) { } @@ -96,7 +97,7 @@ void MarkingGCAwareJITStubRoutineWithOneObject::markRequiredObjectsInternal(Slot PassRefPtr<JITStubRoutine> createJITStubRoutine( const MacroAssemblerCodeRef& code, - JSGlobalData& globalData, + VM& vm, const JSCell*, bool makesCalls) { @@ -104,12 +105,12 @@ PassRefPtr<JITStubRoutine> createJITStubRoutine( return adoptRef(new JITStubRoutine(code)); return static_pointer_cast<JITStubRoutine>( - adoptRef(new GCAwareJITStubRoutine(code, globalData))); + adoptRef(new GCAwareJITStubRoutine(code, vm))); } PassRefPtr<JITStubRoutine> createJITStubRoutine( const MacroAssemblerCodeRef& code, - JSGlobalData& globalData, + VM& vm, const JSCell* owner, bool makesCalls, JSCell* object) @@ -118,7 +119,7 @@ PassRefPtr<JITStubRoutine> createJITStubRoutine( return adoptRef(new JITStubRoutine(code)); return static_pointer_cast<JITStubRoutine>( - adoptRef(new MarkingGCAwareJITStubRoutineWithOneObject(code, globalData, owner, object))); + adoptRef(new MarkingGCAwareJITStubRoutineWithOneObject(code, vm, owner, object))); } } // namespace JSC |