diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-30 01:52:56 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:38 -0400 |
| commit | f39640128068a3816a9bfc28d619f8fa8f161435 (patch) | |
| tree | 020f127bb9c9a79f708d16038288480d0bfe9e26 | |
| parent | 7252778e37cb5f1528999d8051a1ffad500e59ab (diff) | |
| download | UXP-f39640128068a3816a9bfc28d619f8fa8f161435.tar UXP-f39640128068a3816a9bfc28d619f8fa8f161435.tar.gz UXP-f39640128068a3816a9bfc28d619f8fa8f161435.tar.lz UXP-f39640128068a3816a9bfc28d619f8fa8f161435.tar.xz UXP-f39640128068a3816a9bfc28d619f8fa8f161435.zip | |
Fix a thread assertion in NewCopiedArrayTryUseGroup
| -rw-r--r-- | js/src/jsarray.cpp | 2 | ||||
| -rw-r--r-- | js/src/vm/NativeObject-inl.h | 2 | ||||
| -rw-r--r-- | js/src/vm/NativeObject.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp index 8bbcac320..33ff67f36 100644 --- a/js/src/jsarray.cpp +++ b/js/src/jsarray.cpp @@ -3643,7 +3643,7 @@ js::NewCopiedArrayTryUseGroup(ExclusiveContext* cx, HandleObjectGroup group, if (!obj) 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) return nullptr; MOZ_ASSERT(result == DenseElementResult::Success); diff --git a/js/src/vm/NativeObject-inl.h b/js/src/vm/NativeObject-inl.h index 052a3385c..e55e3db04 100644 --- a/js/src/vm/NativeObject-inl.h +++ b/js/src/vm/NativeObject-inl.h @@ -236,7 +236,7 @@ NativeObject::ensureDenseElements(ExclusiveContext* cx, uint32_t index, uint32_t } 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, ShouldUpdateTypes updateTypes) { diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h index d0279556d..9cc6d5436 100644 --- a/js/src/vm/NativeObject.h +++ b/js/src/vm/NativeObject.h @@ -1150,7 +1150,7 @@ class NativeObject : public ShapedObject } 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); bool shouldConvertDoubleElements() { |