Skip to content

Commit ff6070e

Browse files
RaisinTenRafaelGSS
authored andcommitted
deps: V8: cherry-pick cb30b8e17429
Original commit message: Fix compilation error in platform.h for ASAN The last two operands of the conditional expression needs to be of the same type to compile. Change-Id: Ib6cba4acb1238394910c650c776a7fd1ee93721e Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4306802 Commit-Queue: Joyee Cheung <joyee@igalia.com> Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Cr-Commit-Position: refs/heads/main@{#86235} Refs: v8/v8@cb30b8e Refs: #43370 Signed-off-by: Darshan Sen <raisinten@gmail.com> PR-URL: #47307 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 6772aa6 commit ff6070e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
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.12',
39+
'v8_embedder_string': '-node.13',
4040

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

deps/v8/src/base/platform/platform.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -654,9 +654,9 @@ class V8_BASE_EXPORT Stack {
654654
constexpr size_t kAsanRealFrameOffsetBytes = 32;
655655
void* real_frame = __asan_addr_is_in_fake_stack(
656656
__asan_get_current_fake_stack(), slot, nullptr, nullptr);
657-
return real_frame
658-
? (static_cast<char*>(real_frame) + kAsanRealFrameOffsetBytes)
659-
: slot;
657+
return real_frame ? StackSlot(static_cast<char*>(real_frame) +
658+
kAsanRealFrameOffsetBytes)
659+
: slot;
660660
#endif // V8_USE_ADDRESS_SANITIZER
661661
return slot;
662662
}

0 commit comments

Comments
 (0)