summaryrefslogtreecommitdiffstats
path: root/js/src/vm/NativeObject.h
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-08-12 07:57:10 -0500
committertrav90 <travawine@palemoon.org>2018-08-12 07:57:10 -0500
commit9ac48ef8319087fcb68d9021db0af9d5cb1080af (patch)
tree425d7acdb472e54cb530684654d6786a50876fdf /js/src/vm/NativeObject.h
parent9d1bfd4dc7338a39642f07eeea316f76bec43b8c (diff)
downloadUXP-9ac48ef8319087fcb68d9021db0af9d5cb1080af.tar
UXP-9ac48ef8319087fcb68d9021db0af9d5cb1080af.tar.gz
UXP-9ac48ef8319087fcb68d9021db0af9d5cb1080af.tar.lz
UXP-9ac48ef8319087fcb68d9021db0af9d5cb1080af.tar.xz
UXP-9ac48ef8319087fcb68d9021db0af9d5cb1080af.zip
Simplify HeapSlot to make it trivially copyable
This removes the constructors, which were never called since we allocate arrays of HeapSlot with pod_malloc. The destructor is only ever called explicitly since we free this memory with js_free so it has been renamed to destroy(). Also removed is an unused manual barrier.
Diffstat (limited to 'js/src/vm/NativeObject.h')
-rw-r--r--js/src/vm/NativeObject.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h
index f4199b4cf..4dbc167ab 100644
--- a/js/src/vm/NativeObject.h
+++ b/js/src/vm/NativeObject.h
@@ -876,7 +876,7 @@ class NativeObject : public ShapedObject
MOZ_ASSERT(end <= getDenseInitializedLength());
MOZ_ASSERT(!denseElementsAreCopyOnWrite());
for (size_t i = start; i < end; i++)
- elements_[i].HeapSlot::~HeapSlot();
+ elements_[i].destroy();
}
/*
@@ -885,7 +885,7 @@ class NativeObject : public ShapedObject
*/
void prepareSlotRangeForOverwrite(size_t start, size_t end) {
for (size_t i = start; i < end; i++)
- getSlotAddressUnchecked(i)->HeapSlot::~HeapSlot();
+ getSlotAddressUnchecked(i)->destroy();
}
public:
@@ -1130,8 +1130,7 @@ class NativeObject : public ShapedObject
dst->set(this, HeapSlot::Element, dst - elements_, *src);
}
} else {
- memmove(reinterpret_cast<Value*>(elements_ + dstStart), elements_ + srcStart,
- count * sizeof(Value));
+ memmove(elements_ + dstStart, elements_ + srcStart, count * sizeof(HeapSlot));
elementsRangeWriteBarrierPost(dstStart, count);
}
}
@@ -1144,8 +1143,7 @@ class NativeObject : public ShapedObject
MOZ_ASSERT(!denseElementsAreCopyOnWrite());
MOZ_ASSERT(!denseElementsAreFrozen());
- memmove(reinterpret_cast<Value*>(elements_ + dstStart), elements_ + srcStart,
- count * sizeof(Value));
+ memmove(elements_ + dstStart, elements_ + srcStart, count * sizeof(HeapSlot));
elementsRangeWriteBarrierPost(dstStart, count);
}