diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-01-25 10:39:37 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2011-01-25 10:45:00 (GMT) |
| commit | 7db489a0de073a2a56fe32d16f1cbe1bebdfd06d (patch) | |
| tree | a3868384b102c504a1373613d07d872e1c5b81b8 /src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h | |
| parent | cdd776a91e65bf5c30cea1bab9823134a3f797d0 (diff) | |
| download | Qt-7db489a0de073a2a56fe32d16f1cbe1bebdfd06d.zip Qt-7db489a0de073a2a56fe32d16f1cbe1bebdfd06d.tar.gz Qt-7db489a0de073a2a56fe32d16f1cbe1bebdfd06d.tar.bz2 | |
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Cherry-picked from http://trac.webkit.org/changeset/56370
The old allocator caused QML to crash in MCL (TB10.1, week 1).
Task-number: QTBUG-14293
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h index 7f7a679..d3616dc 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.h @@ -35,6 +35,10 @@ #include <pthread.h> #endif +#if OS(SYMBIAN) +#include <wtf/symbian/BlockAllocatorSymbian.h> +#endif + #define ASSERT_CLASS_FITS_IN_CELL(class) COMPILE_ASSERT(sizeof(class) <= CELL_SIZE, class_fits_in_cell) namespace JSC { @@ -167,6 +171,11 @@ namespace JSC { pthread_key_t m_currentThreadRegistrar; #endif +#if OS(SYMBIAN) + // Allocates collector blocks with correct alignment + WTF::AlignedBlockAllocator m_blockallocator; +#endif + JSGlobalData* m_globalData; }; |