Skip to content

Commit b139777

Browse files
joyeecheungV8 LUCI CQ
authored andcommitted
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}
1 parent b5e8750 commit b139777

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/maglev/maglev-ir-inl.h

Lines changed: 4 additions & 3 deletions
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)