@@ -30,7 +30,7 @@ using v8::String;
30
30
using v8::Value;
31
31
using v8::ValueDeserializer;
32
32
using v8::ValueSerializer;
33
- using v8::WasmCompiledModule ;
33
+ using v8::WasmModuleObject ;
34
34
35
35
namespace node {
36
36
namespace worker {
@@ -49,7 +49,7 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {
49
49
Environment* env,
50
50
const std::vector<MessagePort*>& message_ports,
51
51
const std::vector<Local<SharedArrayBuffer>>& shared_array_buffers,
52
- const std::vector<WasmCompiledModule ::TransferrableModule>& wasm_modules)
52
+ const std::vector<WasmModuleObject ::TransferrableModule>& wasm_modules)
53
53
: message_ports_(message_ports),
54
54
shared_array_buffers_ (shared_array_buffers),
55
55
wasm_modules_(wasm_modules) {}
@@ -70,10 +70,10 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {
70
70
return shared_array_buffers_[clone_id];
71
71
}
72
72
73
- MaybeLocal<WasmCompiledModule > GetWasmModuleFromId (
73
+ MaybeLocal<WasmModuleObject > GetWasmModuleFromId (
74
74
Isolate* isolate, uint32_t transfer_id) override {
75
75
CHECK_LE (transfer_id, wasm_modules_.size ());
76
- return WasmCompiledModule ::FromTransferrableModule (
76
+ return WasmModuleObject ::FromTransferrableModule (
77
77
isolate, wasm_modules_[transfer_id]);
78
78
}
79
79
@@ -82,7 +82,7 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {
82
82
private:
83
83
const std::vector<MessagePort*>& message_ports_;
84
84
const std::vector<Local<SharedArrayBuffer>>& shared_array_buffers_;
85
- const std::vector<WasmCompiledModule ::TransferrableModule>& wasm_modules_;
85
+ const std::vector<WasmModuleObject ::TransferrableModule>& wasm_modules_;
86
86
};
87
87
88
88
} // anonymous namespace
@@ -170,7 +170,7 @@ void Message::AddMessagePort(std::unique_ptr<MessagePortData>&& data) {
170
170
message_ports_.emplace_back (std::move (data));
171
171
}
172
172
173
- uint32_t Message::AddWASMModule (WasmCompiledModule ::TransferrableModule&& mod) {
173
+ uint32_t Message::AddWASMModule (WasmModuleObject ::TransferrableModule&& mod) {
174
174
wasm_modules_.emplace_back (std::move (mod));
175
175
return wasm_modules_.size () - 1 ;
176
176
}
@@ -235,7 +235,7 @@ class SerializerDelegate : public ValueSerializer::Delegate {
235
235
}
236
236
237
237
Maybe<uint32_t > GetWasmModuleTransferId (
238
- Isolate* isolate, Local<WasmCompiledModule > module) override {
238
+ Isolate* isolate, Local<WasmModuleObject > module) override {
239
239
return Just (msg_->AddWASMModule (module->GetTransferrableModule ()));
240
240
}
241
241
@@ -302,7 +302,7 @@ Maybe<bool> Message::Serialize(Environment* env,
302
302
Local<ArrayBuffer> ab = entry.As <ArrayBuffer>();
303
303
// If we cannot render the ArrayBuffer unusable in this Isolate and
304
304
// take ownership of its memory, copying the buffer will have to do.
305
- if (!ab->IsNeuterable () || ab->IsExternal () ||
305
+ if (!ab->IsDetachable () || ab->IsExternal () ||
306
306
!env->isolate_data ()->uses_node_allocator ()) {
307
307
continue ;
308
308
}
@@ -368,7 +368,7 @@ Maybe<bool> Message::Serialize(Environment* env,
368
368
// (a.k.a. externalize) the underlying memory region and render
369
369
// it inaccessible in this Isolate.
370
370
ArrayBuffer::Contents contents = ab->Externalize ();
371
- ab->Neuter ();
371
+ ab->Detach ();
372
372
373
373
CHECK (env->isolate_data ()->uses_node_allocator ());
374
374
env->isolate_data ()->node_allocator ()->UnregisterPointer (
0 commit comments