Skip to content

Commit bae4e70

Browse files
joyeecheungnodejs-github-bot
authored andcommitted
deps: V8: cherry-pick 1246d3bfab1a
Original commit message: [api] avoid applying IsGarbageCollectedType<void> The updated version of http://crrev.com/c/8379082 was not enough to remove the resolution of IsGarbageCollectedType<void> which would hit the static_assert(sizeof(T)) assertion. This patch explicitly rejects void again before checking the trait. Change-Id: Ieef4126bcba04e1e3c2bd62e89b7410a47cd2b29 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/8411047 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Joyee Cheung <joyee@igalia.com> Cr-Commit-Position: refs/heads/main@{#109868} Refs: v8/v8@1246d3b Signed-off-by: Joyee Cheung <joyeec9h3@gmail.com> PR-URL: #66537 Reviewed-By: Richard Lau <richard.lau@ibm.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent a9cc80d commit bae4e70

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎common.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
# Reset this number to 0 on major V8 upgrades.
4646
# Increment by one for each non-official patch applied to deps/v8.
47-
'v8_embedder_string': '-node.8',
47+
'v8_embedder_string': '-node.9',
4848

4949
##### V8 defaults for Node.js #####
5050

‎deps/v8/include/v8-context.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77

88
#include <stdint.h>
99

10+
#include <type_traits>
1011
#include <vector>
1112

1213
#include "cppgc/type-traits.h" // NOLINT(build/include_directory)
13-
#include "v8-data.h" // NOLINT(build/include_directory)
14-
#include "v8-local-handle.h" // NOLINT(build/include_directory)
15-
#include "v8-maybe.h" // NOLINT(build/include_directory)
16-
#include "v8-snapshot.h" // NOLINT(build/include_directory)
17-
#include "v8config.h" // NOLINT(build/include_directory)
14+
#include "v8-data.h" // NOLINT(build/include_directory)
15+
#include "v8-local-handle.h" // NOLINT(build/include_directory)
16+
#include "v8-maybe.h" // NOLINT(build/include_directory)
17+
#include "v8-snapshot.h" // NOLINT(build/include_directory)
18+
#include "v8config.h" // NOLINT(build/include_directory)
1819

1920
namespace v8 {
2021

@@ -328,7 +329,7 @@ class V8_EXPORT Context : public Data {
328329
EmbedderDataTypeTag tag);
329330

330331
template <typename T>
331-
requires cppgc::IsGarbageCollectedTypeV<T>
332+
requires(!std::is_void_v<T>) && cppgc::IsGarbageCollectedTypeV<T>
332333
void SetAlignedPointerInEmbedderData(int index, T* value,
333334
CppHeapPointerTag tag) {
334335
SetAlignedPointerInEmbedderDataInternal(index, static_cast<void*>(value),

0 commit comments

Comments
 (0)