From 7a4beaa18206eb479021c2c0640da9405aa54872 Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Fri, 24 Mar 2023 18:30:56 +0100 Subject: [PATCH] deps: V8: cherry-pick 215ccd593edb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: Use FlagValue::value() in SLOW_DCHECK Previously SLOW_DCHECK used the non-constexpr bool() operator of FlagValue, which cannot be used in constexpr. Switch to FlagValue::value() instead for make it compile in constexpr. Change-Id: I3e4f70d82c0027cf56999b6c4639479606151696 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4341495 Reviewed-by: Jakob Linke Commit-Queue: Joyee Cheung Cr-Commit-Position: refs/heads/main@{#86611} Refs: https://github.com/v8/v8/commit/215ccd593edbf18170fa1aae109b6b1cccf0ccbf PR-URL: https://github.com/nodejs/node/pull/47212 Reviewed-By: Michaël Zasso Reviewed-By: Debadree Chatterjee Reviewed-By: Richard Lau --- common.gypi | 2 +- deps/v8/src/common/checks.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 70569b3e3fe785..d1e24c52d81be0 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.14', + 'v8_embedder_string': '-node.15', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/common/checks.h b/deps/v8/src/common/checks.h index 59c845b4f549ff..33d7a8458bd95f 100644 --- a/deps/v8/src/common/checks.h +++ b/deps/v8/src/common/checks.h @@ -15,7 +15,7 @@ #ifdef ENABLE_SLOW_DCHECKS #define SLOW_DCHECK(condition) \ - CHECK(!v8::internal::FLAG_enable_slow_asserts || (condition)) + CHECK(!v8::internal::v8_flags.enable_slow_asserts.value() || (condition)) #define SLOW_DCHECK_IMPLIES(lhs, rhs) SLOW_DCHECK(!(lhs) || (rhs)) #else #define SLOW_DCHECK(condition) ((void)0)