Revert of [wasm] Master CL for Binary 0xC changes.

test/mjsunit/wasm/trap-location.js

Index: test/mjsunit/wasm/trap-location.js
diff --git a/test/mjsunit/wasm/trap-location.js b/test/mjsunit/wasm/trap-location.js
index bc8214f9b2267307b310fdf2806552ca614d4eb1..0440af9ccc6565c80bab645e811b22d5af8b88c1 100644
--- a/test/mjsunit/wasm/trap-location.js
+++ b/test/mjsunit/wasm/trap-location.js
@@ -30,29 +30,29 @@
 builder.addFunction("main", kSig_i_i)
   .addBody([
       // offset 1
-        kExprBlock, kAstI32,
+      kExprBlock,
             kExprGetLocal, 0,
             kExprI32Const, 2,
           kExprI32LtU,
-        kExprIf, kAstStmt,
-        // offset 9
+        kExprIf,
+        // offset 8
               kExprI32Const, 0x7e /* -2 */,
               kExprGetLocal, 0,
             kExprI32DivU,
-          // offset 15
+          // offset 13
           kExprI32LoadMem, 0, 0,
-          kExprBr, 1,
+          kExprBr, 1, 1,
         kExprEnd,
-        // offset 21
+        // offset 20
             kExprGetLocal, 0,
             kExprI32Const, 2,
           kExprI32Eq,
-        kExprIf, kAstStmt,
+        kExprIf,
           kExprUnreachable,
         kExprEnd,
-        // offset 30
-        kExprGetLocal, 0,
-        kExprCallIndirect, sig_index,
+        // offset 28
+          kExprGetLocal, 0,
+        kExprCallIndirect, kArity0, sig_index,
       kExprEnd,
   ])
   .exportAs("main");
@@ -72,7 +72,7 @@
 }
 
 // The actual tests:
-testWasmTrap(0, kTrapDivByZero,      14);
-testWasmTrap(1, kTrapMemOutOfBounds, 15);
-testWasmTrap(2, kTrapUnreachable,    28);
-testWasmTrap(3, kTrapFuncInvalid,    32);
+testWasmTrap(0, kTrapDivByZero,      12);
+testWasmTrap(1, kTrapMemOutOfBounds, 13);
+testWasmTrap(2, kTrapUnreachable,    26);
+testWasmTrap(3, kTrapFuncInvalid,    30);