| Index: src/wasm/wasm-module.cc
|
| diff --git a/src/wasm/wasm-module.cc b/src/wasm/wasm-module.cc
|
| index 40aec7ad33d0fed98c4fac593a6140e71b97a64b..c7d67c31f5ea6a764331f510dec51426a3c357a5 100644
|
| --- a/src/wasm/wasm-module.cc
|
| +++ b/src/wasm/wasm-module.cc
|
| @@ -14,6 +14,7 @@
|
| #include "src/property-descriptor.h"
|
| #include "src/simulator.h"
|
| #include "src/snapshot/snapshot.h"
|
| +#include "src/trap-handler/trap-handler.h"
|
| #include "src/v8.h"
|
|
|
| #include "src/wasm/function-body-decoder.h"
|
| @@ -600,6 +601,17 @@ static void InstanceFinalizer(const v8::WeakCallbackInfo<void>& data) {
|
| DCHECK(compiled_module->has_weak_wasm_module());
|
| WeakCell* weak_wasm_module = compiled_module->ptr_to_weak_wasm_module();
|
|
|
| + if (trap_handler::EnableTrapHandler()) {
|
| + Handle<FixedArray> code_table = compiled_module->code_table();
|
| + for (int i = 0; i < code_table->length(); ++i) {
|
| + Handle<Code> code = code_table->GetValueChecked<Code>(isolate, i);
|
| + int index = code->trap_handler_index()->value();
|
| + if (index >= 0) {
|
| + trap_handler::ReleaseHandlerData(index);
|
| + }
|
| + }
|
| + }
|
| +
|
| // weak_wasm_module may have been cleared, meaning the module object
|
| // was GC-ed. In that case, there won't be any new instances created,
|
| // and we don't need to maintain the links between instances.
|
| @@ -1332,8 +1344,18 @@ class WasmInstanceBuilder {
|
| ->value();
|
| unpacked.emplace_back(data);
|
| }
|
| - // TODO(eholk): Register the protected instruction information once the
|
| - // trap handler is in place.
|
| + if (unpacked.size() > 0) {
|
| + Handle<Code> code = code_table->GetValueChecked<Code>(isolate_, i);
|
| + byte* base = code->entry();
|
| + int size = code->CodeSize();
|
| + trap_handler::CodeObjectData* handler_data =
|
| + CreateHandlerData(reinterpret_cast<void*>(base), size,
|
| + unpacked.size(), &unpacked[0]);
|
| + const int index = RegisterHandlerData(handler_data);
|
| + // TODO(eholk): if index is negative, fail.
|
| + DCHECK(index >= 0);
|
| + code->set_trap_handler_index(Smi::FromInt(index));
|
| + }
|
| }
|
| }
|
|
|
|
|