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/llint/LLIntData.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'Source/JavaScriptCore/llint/LLIntData.cpp') diff --git a/Source/JavaScriptCore/llint/LLIntData.cpp b/Source/JavaScriptCore/llint/LLIntData.cpp index 90faff2ee..079bf3cec 100644 --- a/Source/JavaScriptCore/llint/LLIntData.cpp +++ b/Source/JavaScriptCore/llint/LLIntData.cpp @@ -62,9 +62,9 @@ void initialize() #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wmissing-noreturn" #endif -void Data::performAssertions(JSGlobalData& globalData) +void Data::performAssertions(VM& vm) { - UNUSED_PARAM(globalData); + UNUSED_PARAM(vm); // Assertions to match LowLevelInterpreter.asm. If you change any of this code, be // prepared to change LowLevelInterpreter.asm as well!! @@ -107,11 +107,6 @@ void Data::performAssertions(JSGlobalData& globalData) ASSERT(MasqueradesAsUndefined == 1); ASSERT(ImplementsHasInstance == 2); ASSERT(ImplementsDefaultHasInstance == 8); -#if USE(JSVALUE64) - ASSERT(&globalData.heap.allocatorForObjectWithoutDestructor(JSObject::allocationSize(INLINE_STORAGE_CAPACITY)) - &globalData.heap.firstAllocatorWithoutDestructors() == 1); -#else - ASSERT(&globalData.heap.allocatorForObjectWithoutDestructor(JSObject::allocationSize(INLINE_STORAGE_CAPACITY)) - &globalData.heap.firstAllocatorWithoutDestructors() == 3); -#endif ASSERT(FirstConstantRegisterIndex == 0x40000000); ASSERT(GlobalCode == 0); ASSERT(EvalCode == 1); @@ -121,11 +116,11 @@ void Data::performAssertions(JSGlobalData& globalData) #if !ASSERT_DISABLED Vector testVector; testVector.resize(42); - ASSERT(bitwise_cast(&testVector)[0] == 42); - ASSERT(bitwise_cast(&testVector)[1] == testVector.begin()); + ASSERT(bitwise_cast(&testVector)[sizeof(void*)/sizeof(uint32_t) + 1] == 42); + ASSERT(bitwise_cast(&testVector)[0] == testVector.begin()); #endif - ASSERT(StringImpl::s_hashFlag8BitBuffer == 64); + ASSERT(StringImpl::s_hashFlag8BitBuffer == 32); } #if COMPILER(CLANG) #pragma clang diagnostic pop -- cgit v1.2.1