Upgrade V8 to 5.1.281.57 DO NOT MERGE
FPIIM-449
Change-Id: Id981b686b4d587ac31697662eb98bb34be42ad90
(cherry picked from commit 3b9bc31999c9787eb726ecdbfd5796bfdec32a18)
diff --git a/test/mjsunit/wasm/instantiate-module-basic.js b/test/mjsunit/wasm/instantiate-module-basic.js
index 13a2261..bc13122 100644
--- a/test/mjsunit/wasm/instantiate-module-basic.js
+++ b/test/mjsunit/wasm/instantiate-module-basic.js
@@ -5,33 +5,20 @@
// Flags: --expose-wasm
load("test/mjsunit/wasm/wasm-constants.js");
+load("test/mjsunit/wasm/wasm-module-builder.js");
var kReturnValue = 117;
-var kBodySize = 2;
-var kNameOffset = 19 + kBodySize + 1;
+var module = (function Build() {
+ var builder = new WasmModuleBuilder();
-var data = bytes(
- // -- memory
- kDeclMemory,
- 10, 10, 1,
- // -- signatures
- kDeclSignatures, 1,
- 0, kAstI32, // signature: void -> int
- // -- main function
- kDeclFunctions, 1,
- kDeclFunctionName | kDeclFunctionExport,
- 0, 0, // signature index
- kNameOffset, 0, 0, 0, // name offset
- kBodySize, 0, // body size
- // -- body
- kExprI8Const, // --
- kReturnValue, // --
- kDeclEnd,
- 'm', 'a', 'i', 'n', 0 // name
-);
+ builder.addMemory(1, 1, true);
+ builder.addFunction("main", [kAstI32])
+ .addBody([kExprI8Const, kReturnValue])
+ .exportFunc();
-var module = _WASMEXP_.instantiateModule(data);
+ return builder.instantiate();
+})();
// Check the module exists.
assertFalse(module === undefined);
@@ -40,23 +27,24 @@
assertEquals("object", typeof module);
// Check the memory is an ArrayBuffer.
-var mem = module.memory;
+var mem = module.exports.memory;
assertFalse(mem === undefined);
assertFalse(mem === null);
assertFalse(mem === 0);
assertEquals("object", typeof mem);
assertTrue(mem instanceof ArrayBuffer);
for (var i = 0; i < 4; i++) {
- module.memory = 0; // should be ignored
- assertEquals(mem, module.memory);
+ module.exports.memory = 0; // should be ignored
+ assertEquals(mem, module.exports.memory);
}
-assertEquals(1024, module.memory.byteLength);
+assertEquals(65536, module.exports.memory.byteLength);
// Check the properties of the main function.
-assertFalse(module.main === undefined);
-assertFalse(module.main === null);
-assertFalse(module.main === 0);
-assertEquals("function", typeof module.main);
+var main = module.exports.main;
+assertFalse(main === undefined);
+assertFalse(main === null);
+assertFalse(main === 0);
+assertEquals("function", typeof main);
-assertEquals(kReturnValue, module.main());
+assertEquals(kReturnValue, main());