wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-28 10:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix a thread assertion in NewCopiedArrayTryUseGroup

Browse source
This commit is contained in:
Gaming4JC 2019-06-30 01:52:56 -04:00 • committed by Roy Tam
commit 5b4cd90516
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/src/jsarray.cpp
View file

@ -3643,7 +3643,7 @@ js::NewCopiedArrayTryUseGroup(ExclusiveContext* cx, HandleObjectGroup group,
if (!obj) if (!obj)
return nullptr; return nullptr;
DenseElementResult result = obj->setOrExtendDenseElements(cx->asJSContext(), 0, vp, length, updateTypes); DenseElementResult result = obj->setOrExtendDenseElements(cx, 0, vp, length, updateTypes);
if (result == DenseElementResult::Failure) if (result == DenseElementResult::Failure)
return nullptr; return nullptr;
MOZ_ASSERT(result == DenseElementResult::Success); MOZ_ASSERT(result == DenseElementResult::Success);

2
js/src/vm/NativeObject-inl.h
View file

@ -236,7 +236,7 @@ NativeObject::ensureDenseElements(ExclusiveContext* cx, uint32_t index, uint32_t
} }
inline DenseElementResult inline DenseElementResult
NativeObject::setOrExtendDenseElements(JSContext* cx, uint32_t start, const Value* vp, NativeObject::setOrExtendDenseElements(ExclusiveContext* cx, uint32_t start, const Value* vp,
uint32_t count, uint32_t count,
ShouldUpdateTypes updateTypes) ShouldUpdateTypes updateTypes)
{ {

2
js/src/vm/NativeObject.h
View file

@ -1150,7 +1150,7 @@ class NativeObject : public ShapedObject
} }
inline DenseElementResult inline DenseElementResult
setOrExtendDenseElements(JSContext* cx, uint32_t start, const Value* vp, uint32_t count, setOrExtendDenseElements(ExclusiveContext* cx, uint32_t start, const Value* vp, uint32_t count,
ShouldUpdateTypes updateTypes = ShouldUpdateTypes::Update); ShouldUpdateTypes updateTypes = ShouldUpdateTypes::Update);
bool shouldConvertDoubleElements() { bool shouldConvertDoubleElements() {