Skip to content

Commit

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

    Use std::conditional_t for dependent types

    It otherwise doesn't compile on Apple Clang 14

    Change-Id: I8b2f4bfdc25557fab568456f669c440fb4e31d29
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5771471
    Commit-Queue: Joyee Cheung <[email protected]>
    Reviewed-by: Leszek Swirski <[email protected]>
    Cr-Commit-Position: refs/heads/main@{#95556}

Refs: v8/v8@b139777
PR-URL: #54077
Reviewed-By: Jiawen Geng <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
Reviewed-By: Marco Ippolito <[email protected]>
  • Loading branch information
targos committed Aug 16, 2024
1 parent 415bc75 commit bcc1e27
Show file tree
Hide file tree
Showing 2 changed files with 5 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.10',
'v8_embedder_string': '-node.11',

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

Expand Down
7 changes: 4 additions & 3 deletions deps/v8/src/maglev/maglev-ir-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ enum class DeoptFrameVisitMode {

template <DeoptFrameVisitMode mode, typename T>
using const_if_default =
std::conditional<mode == DeoptFrameVisitMode::kDefault, const T, T>::type;
std::conditional_t<mode == DeoptFrameVisitMode::kDefault, const T, T>;

template <DeoptFrameVisitMode mode>
using ValueNodeT = std::conditional<mode == DeoptFrameVisitMode::kDefault,
ValueNode*, ValueNode*&>::type;
using ValueNodeT =
std::conditional_t<mode == DeoptFrameVisitMode::kDefault, ValueNode*,
ValueNode*&>;

template <DeoptFrameVisitMode mode, typename Function>
void DeepForEachInputSingleFrameImpl(
Expand Down

0 comments on commit bcc1e27

Please sign in to comment.