Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1166041 - Add some assertions to help catch leaked slots memory r=terrence

Browse Source 
--HG--
extra : rebase_source : a0324e603a1b30673c6d3b28313f807ec7f7f401
This commit is contained in:
Jon Coppeard 2015-06-12 10:11:07 +01:00
parent 4de03b092c
commit d997f27268
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,8 @@ js::Allocate(ExclusiveContext* cx, AllocKind kind, size_t nDynamicSlots, Initial
static_assert(sizeof(JSObject_Slots0) >= CellSize,
"All allocations must be at least the allocator-imposed minimum size.");
MOZ_ASSERT_IF(nDynamicSlots != 0, clasp->isNative());
// Off-main-thread alloc cannot trigger GC or make runtime assertions.
if (!cx->isJSContext())
return GCRuntime::tryNewTenuredObject<NoGC>(cx, kind, thingSize, nDynamicSlots);

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

@ -197,6 +197,7 @@ js::Nursery::allocateObject(JSContext* cx, size_t size, size_t numDynamic, const
/* If we want external slots, add them. */
HeapSlot* slots = nullptr;
if (numDynamic) {
MOZ_ASSERT(clasp->isNative());
slots = static_cast<HeapSlot*>(allocateBuffer(cx->zone(), numDynamic * sizeof(HeapSlot)));
if (!slots) {
/*

5
js/src/vm/NativeObject.cpp
View File

@ -333,8 +333,10 @@ NativeObject::setLastPropertyMakeNonNative(Shape* shape)
if (hasDynamicElements())
js_free(getElementsHeader());
if (hasDynamicSlots())
if (hasDynamicSlots()) {
js_free(slots_);
slots_ = nullptr;
}
shape_ = shape;
}
@ -396,6 +398,7 @@ NativeObject::growSlots(ExclusiveContext* cx, uint32_t oldCount, uint32_t newCou
MOZ_ASSERT(newCount < NELEMENTS_LIMIT);
if (!oldCount) {
MOZ_ASSERT(!slots_);
slots_ = AllocateObjectBuffer<HeapSlot>(cx, this, newCount);
if (!slots_)
return false;