Commit ee629440 authored by Adam Klein's avatar Adam Klein

[csa] Update CSA_ASSERT in StoreFixedArrayElement to accept PropertyArrays

Change-Id: I48adcad748a84dccbd542739f436dccfd6adca1d
Reviewed-on: https://chromium-review.googlesource.com/567725Reviewed-by: 's avatarSathya Gunasekaran <gsathya@chromium.org>
Commit-Queue: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46571}
parent 5562f6a2
...@@ -1526,10 +1526,12 @@ Node* CodeStubAssembler::StoreFixedArrayElement(Node* object, Node* index_node, ...@@ -1526,10 +1526,12 @@ Node* CodeStubAssembler::StoreFixedArrayElement(Node* object, Node* index_node,
WriteBarrierMode barrier_mode, WriteBarrierMode barrier_mode,
int additional_offset, int additional_offset,
ParameterMode parameter_mode) { ParameterMode parameter_mode) {
CSA_SLOW_ASSERT(this, IsFixedArray(object)); CSA_SLOW_ASSERT(this,
Word32Or(IsFixedArray(object), IsPropertyArray(object)));
CSA_SLOW_ASSERT(this, MatchesParameterMode(index_node, parameter_mode)); CSA_SLOW_ASSERT(this, MatchesParameterMode(index_node, parameter_mode));
DCHECK(barrier_mode == SKIP_WRITE_BARRIER || DCHECK(barrier_mode == SKIP_WRITE_BARRIER ||
barrier_mode == UPDATE_WRITE_BARRIER); barrier_mode == UPDATE_WRITE_BARRIER);
STATIC_ASSERT(FixedArray::kHeaderSize == PropertyArray::kHeaderSize);
int header_size = int header_size =
FixedArray::kHeaderSize + additional_offset - kHeapObjectTag; FixedArray::kHeaderSize + additional_offset - kHeapObjectTag;
Node* offset = ElementOffsetFromIndex(index_node, HOLEY_ELEMENTS, Node* offset = ElementOffsetFromIndex(index_node, HOLEY_ELEMENTS,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment