| Index: src/wasm/wasm-js.cc
|
| diff --git a/src/wasm/wasm-js.cc b/src/wasm/wasm-js.cc
|
| index 6fde52b90bd67dcd54675268197d1b02bcd28ca2..fe4c7d5e9ef988bef9a6db065102b9a84a146710 100644
|
| --- a/src/wasm/wasm-js.cc
|
| +++ b/src/wasm/wasm-js.cc
|
| @@ -330,10 +330,12 @@ void WebAssemblyInstance(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| }
|
|
|
| i::Handle<i::JSArrayBuffer> memory = i::Handle<i::JSArrayBuffer>::null();
|
| - if (args.Length() > 2 && args[2]->IsArrayBuffer()) {
|
| + if (args.Length() > 2 && args[2]->IsObject()) {
|
| Local<Object> obj = Local<Object>::Cast(args[2]);
|
| i::Handle<i::Object> mem_obj = v8::Utils::OpenHandle(*obj);
|
| - memory = i::Handle<i::JSArrayBuffer>(i::JSArrayBuffer::cast(*mem_obj));
|
| + if (i::WasmJs::IsWasmMemoryObject(i_isolate, mem_obj)) {
|
| + memory = i::WasmJs::GetWasmMemoryArrayBuffer(i_isolate, mem_obj);
|
| + }
|
| }
|
| i::MaybeHandle<i::JSObject> instance =
|
| i::wasm::WasmModule::Instantiate(i_isolate, &thrower, i_obj, ffi, memory);
|
| @@ -465,11 +467,10 @@ void WebAssemblyMemory(const v8::FunctionCallbackInfo<v8::Value>& args) {
|
| }
|
| }
|
| i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
|
| - i::Handle<i::JSArrayBuffer> buffer =
|
| - i_isolate->factory()->NewJSArrayBuffer(i::SharedFlag::kNotShared);
|
| size_t size = static_cast<size_t>(i::wasm::WasmModule::kPageSize) *
|
| static_cast<size_t>(initial);
|
| - i::JSArrayBuffer::SetupAllocatingData(buffer, i_isolate, size);
|
| + i::Handle<i::JSArrayBuffer> buffer =
|
| + i::wasm::NewArrayBuffer(i_isolate, size, i::FLAG_wasm_guard_pages);
|
|
|
| i::Handle<i::JSObject> memory_obj = i::WasmJs::CreateWasmMemoryObject(
|
| i_isolate, buffer, has_maximum.FromJust(), maximum);
|
|
|