6802775efc
This is a reland of 77b0baa649.
Original change's description:
> [wasm] Fix importing wasm-lazy-compile stubs
>
> If two modules use lazy compilation, and one imports a function of
> another, we are unwrapping the js-to-wasm wrapper of the export. This
> was failing so far, because during unwrapping we did not find the wasm
> code.
> This CL fixes this by also recognizing WasmCompileLazy stubs as "wasm
> code".
>
> R=ahaas@chromium.org
>
> Bug: chromium:779569, v8:5991
> Change-Id: If2260c3721e3746a7635b9d0182fd520df2fb773
> Reviewed-on: https://chromium-review.googlesource.com/771672
> Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
> Reviewed-by: Andreas Haas <ahaas@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#49405}
Bug: chromium:779569, v8:5991
Change-Id: I4818e933467bd5a040f1514b8fc18db219a092c7
Reviewed-on: https://chromium-review.googlesource.com/774538
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49426}
50 lines
1.7 KiB
JavaScript
50 lines
1.7 KiB
JavaScript
// Copyright 2017 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
// Flags: --wasm-lazy-compilation
|
|
|
|
load('test/mjsunit/wasm/wasm-constants.js');
|
|
load('test/mjsunit/wasm/wasm-module-builder.js');
|
|
|
|
(function importFromOtherInstance() {
|
|
print(arguments.callee.name);
|
|
const builder1 = new WasmModuleBuilder();
|
|
builder1.addFunction('func', kSig_v_v).addBody([]).exportFunc();
|
|
const instance1 = builder1.instantiate();
|
|
|
|
const builder2 = new WasmModuleBuilder();
|
|
builder2.addImport('mod', 'fn', kSig_v_v);
|
|
builder2.instantiate({mod: {fn: instance1.exports.func}});
|
|
})();
|
|
|
|
(function testWasmToWasmWithDifferentMemory() {
|
|
print(arguments.callee.name);
|
|
const builder1 = new WasmModuleBuilder();
|
|
builder1.addMemory(1, 1, true);
|
|
builder1.addFunction('store', kSig_v_i)
|
|
.addBody([
|
|
kExprI32Const, 0, // i32.const 1
|
|
kExprGetLocal, 0, // get_local 0
|
|
kExprI32StoreMem, 0, 0, // i32.store offset=0 align=0
|
|
])
|
|
.exportFunc();
|
|
const instance1 = builder1.instantiate();
|
|
const mem1 = new Int32Array(instance1.exports.memory.buffer);
|
|
|
|
const builder2 = new WasmModuleBuilder();
|
|
builder2.addMemory(1, 1, true);
|
|
builder2.addImport('mod', 'store', kSig_v_i);
|
|
builder2.addFunction('call_store', kSig_v_i)
|
|
.addBody([kExprGetLocal, 0, kExprCallFunction, 0])
|
|
.exportFunc();
|
|
const instance2 = builder2.instantiate({mod: {store: instance1.exports.store}});
|
|
const mem2 = new Int32Array(instance2.exports.memory.buffer);
|
|
|
|
assertEquals(0, mem1[0]);
|
|
assertEquals(0, mem2[0]);
|
|
instance2.exports.call_store(3);
|
|
assertEquals(3, mem1[0]);
|
|
assertEquals(0, mem2[0]);
|
|
})();
|