Skip to content

Commit d9d26b0

Browse files
committed
deps: V8: cherry-pick 87ce4f5d98a5
Original commit message: [ic] use CSA_DCHECK in CodeStubAssembler::SharedValueBarrier Since the code is generated unconditionally, using a DCHECK to check that shared RO heap is enabled breaks builds with v8_enable_shared_ro_heap set to false, this patch turns that into a CSA_DCHECK so it only crashes when V8 actually attempts to store into a shared struct while the RO heap isn't shared at run time. Refs: #42115 Bug: v8:12547 Change-Id: I30d9a02b98a0b647097125c0a9d141e40d6348cc Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3561598 Reviewed-by: Shu-yu Guo <syg@chromium.org> Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Joyee Cheung <joyee@igalia.com> Cr-Commit-Position: refs/heads/main@{#79756} Refs: v8/v8@87ce4f5 PR-URL: #42657 Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
1 parent 64a6328 commit d9d26b0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.7',
39+
'v8_embedder_string': '-node.8',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/codegen/code-stub-assembler.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -15953,7 +15953,7 @@ void CodeStubAssembler::SharedValueBarrier(
1595315953
GotoIf(TaggedIsSmi(value), &done);
1595415954
// Fast path: Shared memory features imply shared RO space, so RO objects are
1595515955
// trivially shared.
15956-
DCHECK(ReadOnlyHeap::IsReadOnlySpaceShared());
15956+
CSA_DCHECK(this, BoolConstant(ReadOnlyHeap::IsReadOnlySpaceShared()));
1595715957
TNode<IntPtrT> page_flags = LoadBasicMemoryChunkFlags(CAST(value));
1595815958
GotoIf(WordNotEqual(WordAnd(page_flags,
1595915959
IntPtrConstant(BasicMemoryChunk::READ_ONLY_HEAP)),

0 commit comments

Comments
 (0)