Skip to content

Commit e8bb387

Browse files
committed
address PR feedback
1 parent 0d7758a commit e8bb387

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

src/js_native_api_v8.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,6 @@ void Finalizer::ResetFinalizer() {
604604
finalize_hint_ = nullptr;
605605
}
606606

607-
void Finalizer::ResetData(void* data) {
608-
finalize_data_ = data;
609-
}
610-
611607
void Finalizer::CallFinalizer() {
612608
napi_finalize finalize_callback = finalize_callback_;
613609
void* finalize_data = finalize_data_;

src/js_native_api_v8.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inline napi_status napi_clear_last_error(node_api_nogc_env env);
88

99
namespace v8impl {
1010

11-
// Base class to track references and finalizers in a double linked list.
11+
// Base class to track references and finalizers in a doubly linked list.
1212
class RefTracker {
1313
public:
1414
using RefList = RefTracker;
@@ -334,7 +334,6 @@ class Finalizer {
334334

335335
void ResetEnv();
336336
void ResetFinalizer();
337-
void ResetData(void* data);
338337
void CallFinalizer();
339338

340339
private:

src/node_api.cc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,16 @@ namespace {
121121
class BufferFinalizer : private Finalizer {
122122
public:
123123
static BufferFinalizer* New(napi_env env,
124-
napi_finalize finalize_callback = nullptr,
125-
void* finalize_data = nullptr,
126-
void* finalize_hint = nullptr) {
124+
napi_finalize finalize_callback,
125+
void* finalize_data,
126+
void* finalize_hint) {
127127
return new BufferFinalizer(
128128
env, finalize_callback, finalize_data, finalize_hint);
129129
}
130130
// node::Buffer::FreeCallback
131131
static void FinalizeBufferCallback(char* data, void* hint) {
132132
std::unique_ptr<BufferFinalizer, Deleter> finalizer{
133133
static_cast<BufferFinalizer*>(hint)};
134-
finalizer->ResetData(data);
135134
// It is safe to call into JavaScript at this point.
136135
finalizer->CallFinalizer();
137136
}
@@ -1053,7 +1052,7 @@ napi_create_external_buffer(napi_env env,
10531052

10541053
// The finalizer object will delete itself after invoking the callback.
10551054
v8impl::BufferFinalizer* finalizer =
1056-
v8impl::BufferFinalizer::New(env, finalize_cb, nullptr, finalize_hint);
1055+
v8impl::BufferFinalizer::New(env, finalize_cb, data, finalize_hint);
10571056

10581057
v8::MaybeLocal<v8::Object> maybe =
10591058
node::Buffer::New(isolate,

0 commit comments

Comments
 (0)