diff options
| author | Refael Ackermann <refack@gmail.com> | 2019-05-28 08:46:21 -0400 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2019-06-01 09:55:12 -0400 |
| commit | ed74896b1fae1c163b3906163f3bf46326618ddb (patch) | |
| tree | 7fb05c5a19808e0c5cd95837528e9005999cf540 /deps/v8/src/asmjs/asm-js.cc | |
| parent | 2a850cd0664a4eee51f44d0bb8c2f7a3fe444154 (diff) | |
| download | node-new-ed74896b1fae1c163b3906163f3bf46326618ddb.tar.gz | |
deps: update V8 to 7.5.288.22
PR-URL: https://github.com/nodejs/node/pull/27375
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'deps/v8/src/asmjs/asm-js.cc')
| -rw-r--r-- | deps/v8/src/asmjs/asm-js.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/deps/v8/src/asmjs/asm-js.cc b/deps/v8/src/asmjs/asm-js.cc index a84c88546e..44a3f439f6 100644 --- a/deps/v8/src/asmjs/asm-js.cc +++ b/deps/v8/src/asmjs/asm-js.cc @@ -355,11 +355,11 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(Isolate* isolate, instantiate_timer.Start(); Handle<HeapNumber> uses_bitset(wasm_data->uses_bitset(), isolate); Handle<Script> script(Script::cast(shared->script()), isolate); + const auto& wasm_engine = isolate->wasm_engine(); // Allocate the WasmModuleObject. Handle<WasmModuleObject> module = - isolate->wasm_engine()->FinalizeTranslatedAsmJs(isolate, wasm_data, - script); + wasm_engine->FinalizeTranslatedAsmJs(isolate, wasm_data, script); // TODO(mstarzinger): The position currently points to the module definition // but should instead point to the instantiation site (more intuitive). @@ -387,7 +387,7 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(Isolate* isolate, ReportInstantiationFailure(script, position, "Requires heap buffer"); return MaybeHandle<Object>(); } - memory->set_is_growable(false); + wasm_engine->memory_tracker()->MarkWasmMemoryNotGrowable(memory); size_t size = memory->byte_length(); // Check the asm.js heap size against the valid limits. if (!IsValidAsmjsMemorySize(size)) { @@ -400,8 +400,7 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(Isolate* isolate, wasm::ErrorThrower thrower(isolate, "AsmJs::Instantiate"); MaybeHandle<Object> maybe_module_object = - isolate->wasm_engine()->SyncInstantiate(isolate, &thrower, module, - foreign, memory); + wasm_engine->SyncInstantiate(isolate, &thrower, module, foreign, memory); if (maybe_module_object.is_null()) { // An exception caused by the module start function will be set as pending // and bypass the {ErrorThrower}, this happens in case of a stack overflow. |