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/unreachable.js b/test/mjsunit/wasm/unreachable.js
index 10eea23..3e2dffb 100644
--- a/test/mjsunit/wasm/unreachable.js
+++ b/test/mjsunit/wasm/unreachable.js
@@ -5,42 +5,20 @@
// Flags: --expose-wasm
load("test/mjsunit/wasm/wasm-constants.js");
+load("test/mjsunit/wasm/wasm-module-builder.js");
-var module = (function () {
- var kFuncWithBody = 9;
- var kFuncImported = 7;
- var kBodySize1 = 1;
- var kMainOffset = 6 + kFuncWithBody + kBodySize1 + 1;
+var main = (function () {
+ var builder = new WasmModuleBuilder();
+ builder.addFunction("main", [kAstStmt])
+ .addBody([kExprUnreachable])
+ .exportAs("main");
- var ffi = new Object();
- ffi.add = (function(a, b) { return a + b | 0; });
-
- return _WASMEXP_.instantiateModule(bytes(
- // -- signatures
- kDeclSignatures, 1,
- 0, kAstStmt, // void -> void
- // -- function #0 (unreachable)
- kDeclFunctions, 1,
- kDeclFunctionName | kDeclFunctionExport,
- 0, 0, // signature offset
- kMainOffset, 0, 0, 0, // name offset
- kBodySize1, 0, // body size
- kExprUnreachable,
- kDeclEnd,
- 'm', 'a', 'i', 'n', 0 // name
- ), ffi);
+ return builder.instantiate().exports.main;
})();
-// Check the module exists.
-assertFalse(module === undefined);
-assertFalse(module === null);
-assertFalse(module === 0);
-assertEquals("object", typeof module);
-assertEquals("function", typeof module.main);
-
var exception = "";
try {
- assertEquals(0, module.main());
+ assertEquals(0, main());
} catch(e) {
print("correctly caught: " + e);
exception = e;