wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 900405 - Fix an incorrect assertion and missing check for minor GC; r=billm

Browse Source
This commit is contained in:
Terrence Cole 2013-08-01 13:18:44 -07:00
parent e8efd45946
commit 6c49f9ce91
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/gc/Nursery.cpp
View File

@ -508,7 +508,7 @@ js::Nursery::moveElementsToTenured(JSObject *dst, JSObject *src, AllocKind dstKi
return nslots * sizeof(HeapSlot);
}
JS_ASSERT(nslots > 2);
JS_ASSERT(nslots >= 2);
size_t nbytes = nslots * sizeof(HeapValue);
dstHeader = static_cast<ObjectElements *>(zone->malloc_(nbytes));
if (!dstHeader)

3
js/src/jit-test/tests/gc/bug-900405.js Normal file
View File

@ -0,0 +1,3 @@
(function() {
[{ "9": [] }.watch([], function(){})]
})()

2
js/src/jsobjinlines.h
View File

@ -587,7 +587,7 @@ JSObject::create(js::ExclusiveContext *cx, js::gc::AllocKind kind, js::gc::Initi
}
#ifdef JSGC_GENERATIONAL
if (heap != js::gc::TenuredHeap)
if (slots && heap != js::gc::TenuredHeap)
cx->asJSContext()->runtime()->gcNursery.notifyInitialSlots(obj, slots);
#endif