From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/interpreter/JSStack.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/interpreter/JSStack.cpp') diff --git a/Source/JavaScriptCore/interpreter/JSStack.cpp b/Source/JavaScriptCore/interpreter/JSStack.cpp index f5f9e3763..ec2962a92 100644 --- a/Source/JavaScriptCore/interpreter/JSStack.cpp +++ b/Source/JavaScriptCore/interpreter/JSStack.cpp @@ -43,9 +43,9 @@ static Mutex& stackStatisticsMutex() return staticMutex; } -JSStack::JSStack(JSGlobalData& globalData, size_t capacity) +JSStack::JSStack(VM& vm, size_t capacity) : m_end(0) - , m_topCallFrame(globalData.topCallFrame) + , m_topCallFrame(vm.topCallFrame) { ASSERT(capacity && isPageAligned(capacity)); @@ -135,7 +135,7 @@ void JSStack::enableErrorStackReserve() void JSStack::disableErrorStackReserve() { char* useableEnd = reinterpret_cast(reservationEnd()) - commitSize; - m_useableEnd = reinterpret_cast(useableEnd); + m_useableEnd = reinterpret_cast_ptr(useableEnd); // By the time we get here, we are guaranteed to be destructing the last // Interpreter::ErrorHandlingMode that enabled this reserve in the first -- cgit v1.2.1