Skip to content

Commit bcc1e27

Browse files
committedAug 16, 2024
deps: V8: cherry-pick b1397772c70c
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 <joyee@igalia.com> Reviewed-by: Leszek Swirski <leszeks@chromium.org> Cr-Commit-Position: refs/heads/main@{#95556} Refs: v8/v8@b139777 PR-URL: #54077 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
1 parent 415bc75 commit bcc1e27

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed
 

Diff for: ‎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.10',
39+
'v8_embedder_string': '-node.11',
4040

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

Diff for: ‎deps/v8/src/maglev/maglev-ir-inl.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ enum class DeoptFrameVisitMode {
3030

3131
template <DeoptFrameVisitMode mode, typename T>
3232
using const_if_default =
33-
std::conditional<mode == DeoptFrameVisitMode::kDefault, const T, T>::type;
33+
std::conditional_t<mode == DeoptFrameVisitMode::kDefault, const T, T>;
3434

3535
template <DeoptFrameVisitMode mode>
36-
using ValueNodeT = std::conditional<mode == DeoptFrameVisitMode::kDefault,
37-
ValueNode*, ValueNode*&>::type;
36+
using ValueNodeT =
37+
std::conditional_t<mode == DeoptFrameVisitMode::kDefault, ValueNode*,
38+
ValueNode*&>;
3839

3940
template <DeoptFrameVisitMode mode, typename Function>
4041
void DeepForEachInputSingleFrameImpl(

0 commit comments

Comments
 (0)
Please sign in to comment.