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

Bug 1233175 - refine an assertion. r=terrence

Browse Source 
--HG--
extra : rebase_source : 518f694b368b3f36079797148986c3b20fa65313
extra : amend_source : 02fe6352087a26d0958244e9fa7ce1594d9ec39e
This commit is contained in:
Lars T Hansen 2015-12-17 12:42:17 +01:00
parent f2f6c3be20
commit 3c35bb857f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/vm/TypedArrayObject.cpp
View File

@ -370,8 +370,18 @@ class TypedArrayObjectTemplate : public TypedArrayObject
// may be in the nursery, so include a barrier to make sure this
// object is updated if that typed object moves.
if (!IsInsideNursery(obj) && cx->runtime()->gc.nursery.isInside(buffer->dataPointerEither())) {
MOZ_ASSERT(!isSharedMemory);
cx->runtime()->gc.storeBuffer.putWholeCell(obj);
// Shared buffer data should never be nursery-allocated, so
// we need to fail here if isSharedMemory. However, mmap()
// can place a SharedArrayRawBuffer up against the bottom end
// of the nursery, and a zero-length buffer will erroneously be
// perceived as being inside the nursery; sidestep that.
if (isSharedMemory) {
MOZ_ASSERT(buffer->byteLength() == 0 &&
cx->runtime()->gc.nursery.start() ==
buffer->dataPointerEither().unwrapValue());
} else {
cx->runtime()->gc.storeBuffer.putWholeCell(obj);
}
}
} else {
void* data = obj->fixedData(FIXED_DATA_START);