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/llint/LLIntData.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/llint/LLIntData.cpp')
| -rw-r--r-- | Source/JavaScriptCore/llint/LLIntData.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
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<int> testVector; testVector.resize(42); - ASSERT(bitwise_cast<size_t*>(&testVector)[0] == 42); - ASSERT(bitwise_cast<int**>(&testVector)[1] == testVector.begin()); + ASSERT(bitwise_cast<uint32_t*>(&testVector)[sizeof(void*)/sizeof(uint32_t) + 1] == 42); + ASSERT(bitwise_cast<int**>(&testVector)[0] == testVector.begin()); #endif - ASSERT(StringImpl::s_hashFlag8BitBuffer == 64); + ASSERT(StringImpl::s_hashFlag8BitBuffer == 32); } #if COMPILER(CLANG) #pragma clang diagnostic pop |