[wasm] Master CL for Binary 0xC changes.

test/mjsunit/wasm/trap-location.js

 // Copyright 2016 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: --expose-wasm
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 // Collect the Callsite objects instead of just a string:
@@ skipping 12 matching lines @@
 //     unreachable;
 //   } else {
 //     return call_indirect(idx);
 //   }
 // There are four different traps which are triggered by different input values:
 // (0) division by zero; (1) mem oob; (2) unreachable; (3) invalid call target
 // Each of them also has a different location where it traps.
 builder.addFunction("main", kSig_i_i)
   .addBody([
       // offset 1
-      kExprBlock,
+        kExprBlock, kAstI32,
             kExprGetLocal, 0,
             kExprI32Const, 2,
           kExprI32LtU,
-        kExprIf,
-        // offset 8
+        kExprIf, kAstStmt,
+        // offset 9
               kExprI32Const, 0x7e /* -2 */,
               kExprGetLocal, 0,
             kExprI32DivU,
-          // offset 13
+          // offset 15
           kExprI32LoadMem, 0, 0,
-          kExprBr, 1, 1,
+          kExprBr, 1,
         kExprEnd,
-        // offset 20
+        // offset 21
             kExprGetLocal, 0,
             kExprI32Const, 2,
           kExprI32Eq,
-        kExprIf,
+        kExprIf, kAstStmt,
           kExprUnreachable,
         kExprEnd,
-        // offset 28
-          kExprGetLocal, 0,
-        kExprCallIndirect, kArity0, sig_index,
+        // offset 30
+        kExprGetLocal, 0,
+        kExprCallIndirect, sig_index,
       kExprEnd,
   ])
   .exportAs("main");
 
 var module = builder.instantiate();
 
 function testWasmTrap(value, reason, position) {
   try {
     module.exports.main(value);
     fail("expected wasm exception");
   } catch (e) {
     assertEquals(kTrapMsgs[reason], e.message, "trap reason");
     assertEquals(3, e.stack.length, "number of frames");
     assertEquals(0, e.stack[0].getLineNumber(), "wasmFunctionIndex");
     assertEquals(position, e.stack[0].getPosition(), "position");
   }
 }
 
 // The actual tests:
-testWasmTrap(0, kTrapDivByZero,      12);
-testWasmTrap(1, kTrapMemOutOfBounds, 13);
-testWasmTrap(2, kTrapUnreachable,    26);
-testWasmTrap(3, kTrapFuncInvalid,    30);
+testWasmTrap(0, kTrapDivByZero,      14);
+testWasmTrap(1, kTrapMemOutOfBounds, 15);
+testWasmTrap(2, kTrapUnreachable,    28);
+testWasmTrap(3, kTrapFuncInvalid,    32);