From d0be641ba9b8ba47885dab186ca5e14f513e4059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 26 Aug 2024 20:04:23 +0200 Subject: [PATCH] deps: V8: cherry-pick 01a47f3ffff2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: [cfi] Add missing 'typename' in SegmentedTable Makes the code more consistent and fixes compilation on older Clang versions. Change-Id: I82abebd500e6651ac5c5b180cd7b49b4f20e8299 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5805956 Reviewed-by: Samuel Groß Commit-Queue: Michaël Zasso Reviewed-by: Stephen Röttger Cr-Commit-Position: refs/heads/main@{#95809} Refs: https://github.com/v8/v8/commit/01a47f3ffff2621acdbc5dce0624a31679df4083 PR-URL: https://github.com/nodejs/node/pull/54536 Reviewed-By: Antoine du Hamel Reviewed-By: Jiawen Geng Reviewed-By: Marco Ippolito Reviewed-By: Richard Lau --- common.gypi | 2 +- deps/v8/src/common/segmented-table-inl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index af2f3d9cb1a841..9d4d89afcd5fbc 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.7', + 'v8_embedder_string': '-node.8', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/common/segmented-table-inl.h b/deps/v8/src/common/segmented-table-inl.h index 357713e5c8edda..28fa17ef525eab 100644 --- a/deps/v8/src/common/segmented-table-inl.h +++ b/deps/v8/src/common/segmented-table-inl.h @@ -103,7 +103,7 @@ void SegmentedTable::TearDown() { } template -SegmentedTable::FreelistHead +typename SegmentedTable::FreelistHead SegmentedTable::InitializeFreeList(Segment segment, uint32_t start_offset) { DCHECK_LT(start_offset, kEntriesPerSegment);