diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-30 23:10:45 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-30 23:10:45 +0200 |
| commit | dc79ad17bf7f40ace6b988e687e4d193615aa576 (patch) | |
| tree | 1981d0cf5de2c70ffb3f5c5260174c27aa7da522 /Source/JavaScriptCore/llint/LLIntData.cpp | |
| parent | 4b6772fbf7ec96eb95a0d32f2a3a2005147efeb7 (diff) | |
| parent | 2efedcdc92b15b5a29de5de370f92f11892498c3 (diff) | |
| download | qtwebkit-dc79ad17bf7f40ace6b988e687e4d193615aa576.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibd9bacebd17018d03e6e5bd93d171b18173c9ee7
Diffstat (limited to 'Source/JavaScriptCore/llint/LLIntData.cpp')
| -rw-r--r-- | Source/JavaScriptCore/llint/LLIntData.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/llint/LLIntData.cpp b/Source/JavaScriptCore/llint/LLIntData.cpp index 079bf3cec..f91da9c0a 100644 --- a/Source/JavaScriptCore/llint/LLIntData.cpp +++ b/Source/JavaScriptCore/llint/LLIntData.cpp @@ -120,7 +120,7 @@ void Data::performAssertions(VM& vm) ASSERT(bitwise_cast<int**>(&testVector)[0] == testVector.begin()); #endif - ASSERT(StringImpl::s_hashFlag8BitBuffer == 32); + ASSERT(StringImpl::s_hashFlag8BitBuffer == 64); } #if COMPILER(CLANG) #pragma clang diagnostic pop |