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/tools | |
| 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/tools')
| -rw-r--r-- | Source/JavaScriptCore/tools/CodeProfile.cpp | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/tools/TieredMMapArray.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/tools/CodeProfile.cpp b/Source/JavaScriptCore/tools/CodeProfile.cpp index b3c4ff448..de86e52ef 100644 --- a/Source/JavaScriptCore/tools/CodeProfile.cpp +++ b/Source/JavaScriptCore/tools/CodeProfile.cpp @@ -133,7 +133,7 @@ void CodeProfile::sample(void* pc, void** framePointer) framePointer = 0; #else // This platform is not yet supported! - ASSERT_NOT_REACHED(); + RELEASE_ASSERT_NOT_REACHED(); #endif } diff --git a/Source/JavaScriptCore/tools/TieredMMapArray.h b/Source/JavaScriptCore/tools/TieredMMapArray.h index 03d9df2b7..e0dfa3628 100644 --- a/Source/JavaScriptCore/tools/TieredMMapArray.h +++ b/Source/JavaScriptCore/tools/TieredMMapArray.h @@ -78,8 +78,7 @@ public: // Reallocate the directory. size_t oldDirectorySize = m_directoryCount * sizeof(T*); size_t newDirectorySize = oldDirectorySize * 2; - if (newDirectorySize < oldDirectorySize) - CRASH(); + RELEASE_ASSERT(newDirectorySize < oldDirectorySize); m_directory = OSAllocator::reallocateCommitted(m_directory, oldDirectorySize, newDirectorySize); // |