Skip to content

Commit

Permalink
deps: V8: cherry-pick 5681a6565828
Browse files Browse the repository at this point in the history
Original commit message:

    [rab/gsab] Fix missing assignment in BackingStore::Reallocate

    See nodejs#39945

    Bug: v8:11111
    Change-Id: I7271a907bf036c18a014b2a13ff5746db622456a
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3141581
    Reviewed-by: Leszek Swirski <leszeks@chromium.org>
    Commit-Queue: Marja Hölttä <marja@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#76670}

Refs: v8/v8@5681a65

Backport-PR-URL: nodejs#40285
PR-URL: nodejs#39945
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
  • Loading branch information
targos committed Oct 4, 2021
1 parent 150d816 commit 8de5eb8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.9',
'v8_embedder_string': '-node.10',

##### V8 defaults for Node.js #####

Expand Down
3 changes: 2 additions & 1 deletion deps/v8/src/objects/backing-store.cc
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ std::unique_ptr<BackingStore> BackingStore::EmptyBackingStore(

bool BackingStore::Reallocate(Isolate* isolate, size_t new_byte_length) {
CHECK(!is_wasm_memory_ && !custom_deleter_ && !globally_registered_ &&
free_on_destruct_);
free_on_destruct_ && !is_resizable_);
auto allocator = get_v8_api_array_buffer_allocator();
CHECK_EQ(isolate->array_buffer_allocator(), allocator);
CHECK_EQ(byte_length_, byte_capacity_);
Expand All @@ -776,6 +776,7 @@ bool BackingStore::Reallocate(Isolate* isolate, size_t new_byte_length) {
buffer_start_ = new_start;
byte_capacity_ = new_byte_length;
byte_length_ = new_byte_length;
max_byte_length_ = new_byte_length;
return true;
}

Expand Down

0 comments on commit 8de5eb8

Please sign in to comment.