From bcc1e2716ccc06fb29b28b8b51af0b44edcb1c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 9 Aug 2024 16:33:17 +0200 Subject: [PATCH] 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 Reviewed-by: Leszek Swirski Cr-Commit-Position: refs/heads/main@{#95556} Refs: https://github.com/v8/v8/commit/b1397772c70c7f76a4e922405e82b4895e9a5279 PR-URL: https://github.com/nodejs/node/pull/54077 Reviewed-By: Jiawen Geng Reviewed-By: Richard Lau Reviewed-By: Joyee Cheung Reviewed-By: Marco Ippolito --- common.gypi | 2 +- deps/v8/src/maglev/maglev-ir-inl.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common.gypi b/common.gypi index 350b54ad9d5..23196aae451 100644 --- a/common.gypi +++ b/common.gypi @@ -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 ##### diff --git a/deps/v8/src/maglev/maglev-ir-inl.h b/deps/v8/src/maglev/maglev-ir-inl.h index 67bae927335..5c7d17c8110 100644 --- a/deps/v8/src/maglev/maglev-ir-inl.h +++ b/deps/v8/src/maglev/maglev-ir-inl.h @@ -30,11 +30,12 @@ enum class DeoptFrameVisitMode { template using const_if_default = - std::conditional::type; + std::conditional_t; template -using ValueNodeT = std::conditional::type; +using ValueNodeT = + std::conditional_t; template void DeepForEachInputSingleFrameImpl(