Skip to content

Commit

Permalink
deps: V8: cherry-pick cb30b8e17429
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
RaisinTen authored and RafaelGSS committed Apr 7, 2023
1 parent 6772aa6 commit ff6070e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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.12',
'v8_embedder_string': '-node.13',

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

Expand Down
6 changes: 3 additions & 3 deletions deps/v8/src/base/platform/platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,9 @@ class V8_BASE_EXPORT Stack {
constexpr size_t kAsanRealFrameOffsetBytes = 32;
void* real_frame = __asan_addr_is_in_fake_stack(
__asan_get_current_fake_stack(), slot, nullptr, nullptr);
return real_frame
? (static_cast<char*>(real_frame) + kAsanRealFrameOffsetBytes)
: slot;
return real_frame ? StackSlot(static_cast<char*>(real_frame) +
kAsanRealFrameOffsetBytes)
: slot;
#endif // V8_USE_ADDRESS_SANITIZER
return slot;
}
Expand Down

0 comments on commit ff6070e

Please sign in to comment.