diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:51:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:51:09 +0200 |
| commit | 36adb61678416f2062214c3810b9e18e5d225ed7 (patch) | |
| tree | f0f968dd1fecf077ba2323988796a699b4c9e593 | |
| parent | 38f5d4df0783169a02fce171e7947f18f3815b32 (diff) | |
| parent | 11ca34818ad9a982f653cfd727f1b7d677efa9a9 (diff) | |
| download | qtscript-36adb61678416f2062214c3810b9e18e5d225ed7.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: I15ca1dd24c27b5561af6203b542331bb2471379f
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp index d95f078..14b7d76 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp @@ -2635,8 +2635,11 @@ void* TCMalloc_Central_FreeList::FetchFromSpansSafe() { } void* TCMalloc_Central_FreeList::FetchFromSpans() { - if (DLL_IsEmpty(&nonempty_)) return NULL; +// Intel compiler bug; issue id 6000056746 +// if (DLL_IsEmpty(&nonempty_)) return NULL; Span* span = nonempty_.next; + if (span == &nonempty_) + return NULL; ASSERT(span->objects != NULL); ASSERT_SPAN_COMMITTED(span); |