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.
This commit is contained in:
trav90 2018-08-12 07:57:10 -05:00 • committed by Roy Tam
commit 4f91b109d0
2 changed files with 8 additions and 29 deletions

View file

@ -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);
}