diff options
| author | trav90 <travawine@palemoon.org> | 2018-08-12 07:51:14 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-08-12 07:51:14 -0500 |
| commit | 9d1bfd4dc7338a39642f07eeea316f76bec43b8c (patch) | |
| tree | fbe536a6544c7dff73f351ce9dc671e3ed2be0fd /js | |
| parent | e1ac3350e21e2cfd9f31b54b86423ef7dcfb3e39 (diff) | |
| download | UXP-9d1bfd4dc7338a39642f07eeea316f76bec43b8c.tar UXP-9d1bfd4dc7338a39642f07eeea316f76bec43b8c.tar.gz UXP-9d1bfd4dc7338a39642f07eeea316f76bec43b8c.tar.lz UXP-9d1bfd4dc7338a39642f07eeea316f76bec43b8c.tar.xz UXP-9d1bfd4dc7338a39642f07eeea316f76bec43b8c.zip | |
Avoid using memcpy on HeapSlot that is not trivially copyable.
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/vm/NativeObject.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h index d2c06eabc..f4199b4cf 100644 --- a/js/src/vm/NativeObject.h +++ b/js/src/vm/NativeObject.h @@ -1085,7 +1085,8 @@ class NativeObject : public ShapedObject for (uint32_t i = 0; i < count; ++i) elements_[dstStart + i].set(this, HeapSlot::Element, dstStart + i, src[i]); } else { - memcpy(&elements_[dstStart], src, count * sizeof(HeapSlot)); + memcpy(reinterpret_cast<Value*>(&elements_[dstStart]), src, + count * sizeof(Value)); elementsRangeWriteBarrierPost(dstStart, count); } } @@ -1094,7 +1095,7 @@ class NativeObject : public ShapedObject MOZ_ASSERT(dstStart + count <= getDenseCapacity()); MOZ_ASSERT(!denseElementsAreCopyOnWrite()); MOZ_ASSERT(!denseElementsAreFrozen()); - memcpy(&elements_[dstStart], src, count * sizeof(HeapSlot)); + memcpy(reinterpret_cast<Value*>(&elements_[dstStart]), src, count * sizeof(Value)); elementsRangeWriteBarrierPost(dstStart, count); } @@ -1129,7 +1130,8 @@ class NativeObject : public ShapedObject dst->set(this, HeapSlot::Element, dst - elements_, *src); } } else { - memmove(elements_ + dstStart, elements_ + srcStart, count * sizeof(HeapSlot)); + memmove(reinterpret_cast<Value*>(elements_ + dstStart), elements_ + srcStart, + count * sizeof(Value)); elementsRangeWriteBarrierPost(dstStart, count); } } @@ -1142,7 +1144,8 @@ class NativeObject : public ShapedObject MOZ_ASSERT(!denseElementsAreCopyOnWrite()); MOZ_ASSERT(!denseElementsAreFrozen()); - memmove(elements_ + dstStart, elements_ + srcStart, count * sizeof(Value)); + memmove(reinterpret_cast<Value*>(elements_ + dstStart), elements_ + srcStart, + count * sizeof(Value)); elementsRangeWriteBarrierPost(dstStart, count); } |