Commit da93e7e4de9 for nodejs
commit da93e7e4de9e287293816c1b2f36372877ec6300
Author: Michaël Zasso <targos@protonmail.com>
Date: Thu Apr 30 08:24:20 2026 +0200
src: migrate from `v8::PropertyCallbackInfo<void>`
Signed-Off-By: Michaël Zasso <targos@protonmail.com>
Signed-off-by: Joyee Cheung <joyeec9h3@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65161
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 997f8b2c3ce..80efadd7a82 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -598,7 +598,7 @@ Intercepted ContextifyContext::PropertyGetterCallback(
Intercepted ContextifyContext::PropertySetterCallback(
Local<Name> property,
Local<Value> value,
- const PropertyCallbackInfo<void>& args) {
+ const PropertyCallbackInfo<Boolean>& args) {
ContextifyContext* ctx = ContextifyContext::Get(args);
// Still initializing
@@ -691,7 +691,7 @@ Intercepted ContextifyContext::PropertyDescriptorCallback(
Intercepted ContextifyContext::PropertyDefinerCallback(
Local<Name> property,
const PropertyDescriptor& desc,
- const PropertyCallbackInfo<void>& args) {
+ const PropertyCallbackInfo<Boolean>& args) {
ContextifyContext* ctx = ContextifyContext::Get(args);
// Still initializing
@@ -871,7 +871,7 @@ Intercepted ContextifyContext::IndexedPropertyGetterCallback(
Intercepted ContextifyContext::IndexedPropertySetterCallback(
uint32_t index,
Local<Value> value,
- const PropertyCallbackInfo<void>& args) {
+ const PropertyCallbackInfo<Boolean>& args) {
ContextifyContext* ctx = ContextifyContext::Get(args);
// Still initializing
@@ -900,7 +900,7 @@ Intercepted ContextifyContext::IndexedPropertyDescriptorCallback(
Intercepted ContextifyContext::IndexedPropertyDefinerCallback(
uint32_t index,
const PropertyDescriptor& desc,
- const PropertyCallbackInfo<void>& args) {
+ const PropertyCallbackInfo<Boolean>& args) {
ContextifyContext* ctx = ContextifyContext::Get(args);
// Still initializing
diff --git a/src/node_contextify.h b/src/node_contextify.h
index 1066633daf6..446cab2f580 100644
--- a/src/node_contextify.h
+++ b/src/node_contextify.h
@@ -153,14 +153,14 @@ class ContextifyContext final : CPPGC_MIXIN(ContextifyContext) {
static v8::Intercepted PropertySetterCallback(
v8::Local<v8::Name> property,
v8::Local<v8::Value> value,
- const v8::PropertyCallbackInfo<void>& args);
+ const v8::PropertyCallbackInfo<v8::Boolean>& args);
static v8::Intercepted PropertyDescriptorCallback(
v8::Local<v8::Name> property,
const v8::PropertyCallbackInfo<v8::Value>& args);
static v8::Intercepted PropertyDefinerCallback(
v8::Local<v8::Name> property,
const v8::PropertyDescriptor& desc,
- const v8::PropertyCallbackInfo<void>& args);
+ const v8::PropertyCallbackInfo<v8::Boolean>& args);
static v8::Intercepted PropertyDeleterCallback(
v8::Local<v8::Name> property,
const v8::PropertyCallbackInfo<v8::Boolean>& args);
@@ -173,13 +173,13 @@ class ContextifyContext final : CPPGC_MIXIN(ContextifyContext) {
static v8::Intercepted IndexedPropertySetterCallback(
uint32_t index,
v8::Local<v8::Value> value,
- const v8::PropertyCallbackInfo<void>& args);
+ const v8::PropertyCallbackInfo<v8::Boolean>& args);
static v8::Intercepted IndexedPropertyDescriptorCallback(
uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& args);
static v8::Intercepted IndexedPropertyDefinerCallback(
uint32_t index,
const v8::PropertyDescriptor& desc,
- const v8::PropertyCallbackInfo<void>& args);
+ const v8::PropertyCallbackInfo<v8::Boolean>& args);
static v8::Intercepted IndexedPropertyDeleterCallback(
uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& args);
static void IndexedPropertyEnumeratorCallback(
diff --git a/src/node_env_var.cc b/src/node_env_var.cc
index 0e7ce411743..80a4432a60f 100644
--- a/src/node_env_var.cc
+++ b/src/node_env_var.cc
@@ -556,7 +556,7 @@ static Intercepted EnvGetter(Local<Name> property,
static Intercepted EnvSetter(Local<Name> property,
Local<Value> value,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
Environment* env = Environment::GetCurrent(info);
CHECK(env->has_run_bootstrapping_code());
// calling env->EmitProcessEnvWarning() sets a variable indicating that
@@ -644,7 +644,7 @@ static void EnvEnumerator(const PropertyCallbackInfo<Array>& info) {
static Intercepted EnvDefiner(Local<Name> property,
const PropertyDescriptor& desc,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
Environment* env = Environment::GetCurrent(info);
if (desc.has_value()) {
if (!desc.has_writable() ||
@@ -694,7 +694,7 @@ static Intercepted EnvGetterIndexed(uint32_t index,
static Intercepted EnvSetterIndexed(uint32_t index,
Local<Value> value,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
Environment* env = Environment::GetCurrent(info);
Local<Name> name = Uint32ToString(env->context(), index);
return EnvSetter(name, value, info);
@@ -714,9 +714,10 @@ static Intercepted EnvDeleterIndexed(
return EnvDeleter(name, info);
}
-static Intercepted EnvDefinerIndexed(uint32_t index,
- const PropertyDescriptor& desc,
- const PropertyCallbackInfo<void>& info) {
+static Intercepted EnvDefinerIndexed(
+ uint32_t index,
+ const PropertyDescriptor& desc,
+ const PropertyCallbackInfo<Boolean>& info) {
Environment* env = Environment::GetCurrent(info);
Local<Name> name = Uint32ToString(env->context(), index);
return EnvDefiner(name, desc, info);
diff --git a/src/node_external_reference.h b/src/node_external_reference.h
index d1c5608b699..3a2d4176715 100644
--- a/src/node_external_reference.h
+++ b/src/node_external_reference.h
@@ -20,18 +20,18 @@ class ExternalReferenceRegistry {
#define ALLOWED_EXTERNAL_REFERENCE_TYPES(V) \
V(v8::FunctionCallback) \
V(v8::AccessorNameGetterCallback) \
- V(v8::AccessorNameSetterCallback) \
+ V(v8::AccessorNameSetterCallbackV2) \
V(v8::NamedPropertyGetterCallback) \
- V(v8::NamedPropertyDefinerCallback) \
+ V(v8::NamedPropertyDefinerCallbackV2) \
V(v8::NamedPropertyDeleterCallback) \
V(v8::NamedPropertyEnumeratorCallback) \
V(v8::NamedPropertyQueryCallback) \
- V(v8::NamedPropertySetterCallback) \
- V(v8::IndexedPropertyGetterCallbackV2) \
- V(v8::IndexedPropertySetterCallbackV2) \
- V(v8::IndexedPropertyDefinerCallbackV2) \
- V(v8::IndexedPropertyDeleterCallbackV2) \
- V(v8::IndexedPropertyQueryCallbackV2) \
+ V(v8::NamedPropertySetterCallbackV2) \
+ V(v8::IndexedPropertyGetterCallback) \
+ V(v8::IndexedPropertySetterCallback) \
+ V(v8::IndexedPropertyDefinerCallback) \
+ V(v8::IndexedPropertyDeleterCallback) \
+ V(v8::IndexedPropertyQueryCallback) \
V(const v8::String::ExternalStringResourceBase*)
#define V(ExternalReferenceType) \
diff --git a/src/node_process_object.cc b/src/node_process_object.cc
index 5f5af63486a..3132a96abb8 100644
--- a/src/node_process_object.cc
+++ b/src/node_process_object.cc
@@ -12,6 +12,7 @@
#include <climits> // PATH_MAX
namespace node {
+using v8::Boolean;
using v8::Context;
using v8::EscapableHandleScope;
using v8::Function;
@@ -40,7 +41,7 @@ static void ProcessTitleGetter(Local<Name> property,
static void ProcessTitleSetter(Local<Name> property,
Local<Value> value,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
node::Utf8Value title(info.GetIsolate(), value);
TRACE_EVENT_METADATA1(
"__metadata", "process_name", "name", TRACE_STR_COPY(*title));
@@ -57,7 +58,7 @@ static void DebugPortGetter(Local<Name> property,
static void DebugPortSetter(Local<Name> property,
Local<Value> value,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
Environment* env = Environment::GetCurrent(info);
int32_t port = value->Int32Value(env->context()).FromMaybe(0);
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
index 87f0f20169f..8978670d07e 100644
--- a/src/node_sqlite.cc
+++ b/src/node_sqlite.cc
@@ -928,7 +928,7 @@ Intercepted DatabaseLimits::LimitsGetter(
Intercepted DatabaseLimits::LimitsSetter(
Local<Name> property,
Local<Value> value,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
if (!property->IsString()) {
return Intercepted::kNo;
}
diff --git a/src/node_sqlite.h b/src/node_sqlite.h
index 98f9beabe8f..0f7f6084696 100644
--- a/src/node_sqlite.h
+++ b/src/node_sqlite.h
@@ -637,7 +637,7 @@ class DatabaseLimits : public BaseObject {
static v8::Intercepted LimitsSetter(
v8::Local<v8::Name> property,
v8::Local<v8::Value> value,
- const v8::PropertyCallbackInfo<void>& info);
+ const v8::PropertyCallbackInfo<v8::Boolean>& info);
static v8::Intercepted LimitsQuery(
v8::Local<v8::Name> property,
const v8::PropertyCallbackInfo<v8::Integer>& info);
diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc
index 1a88f706876..204fd463126 100644
--- a/src/node_webstorage.cc
+++ b/src/node_webstorage.cc
@@ -650,7 +650,7 @@ static Intercepted StorageGetter(Local<Name> property,
static Intercepted StorageSetter(Local<Name> property,
Local<Value> value,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
Storage* storage;
ASSIGN_OR_RETURN_UNWRAP(&storage, info.Holder(), Intercepted::kNo);
@@ -700,7 +700,7 @@ static void StorageEnumerator(const PropertyCallbackInfo<Array>& info) {
static Intercepted StorageDefiner(Local<Name> property,
const PropertyDescriptor& desc,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
Storage* storage;
ASSIGN_OR_RETURN_UNWRAP(&storage, info.Holder(), Intercepted::kNo);
@@ -720,7 +720,7 @@ static Intercepted IndexedGetter(uint32_t index,
static Intercepted IndexedSetter(uint32_t index,
Local<Value> value,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
Environment* env = Environment::GetCurrent(info);
Local<Name> name = Uint32ToString(env->context(), index);
return StorageSetter(name, value, info);
@@ -742,7 +742,7 @@ static Intercepted IndexedDeleter(uint32_t index,
static Intercepted IndexedDefiner(uint32_t index,
const PropertyDescriptor& desc,
- const PropertyCallbackInfo<void>& info) {
+ const PropertyCallbackInfo<Boolean>& info) {
Environment* env = Environment::GetCurrent(info);
Local<Name> name = Uint32ToString(env->context(), index);
return StorageDefiner(name, desc, info);