[wasm] Binary 11: AST changes.

test/mjsunit/wasm/module-memory.js

 // Copyright 2015 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 --expose-gc --stress-compaction
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 var kMemSize = 65536;
 
 function genModule(memory) {
   var builder = new WasmModuleBuilder();
 
   builder.addMemory(1, 1, true);
   builder.addFunction("main", [kAstI32, kAstI32])
     .addBody([
-      kExprBlock,2,
-        kExprLoop,1,
+    // main body: while(i) { if(mem[i]) return -1; i -= 4; } return 0;
+      kExprLoop,
+        kExprGetLocal,0,
+        kExprIf,
+            kExprGetLocal,0,
+          kExprI32LoadMem,0,0,
           kExprIf,
-            kExprGetLocal,0,
-            kExprBr, 0,
-              kExprIfElse,
-                kExprI32LoadMem,0,0,kExprGetLocal,0,
-                kExprBr,2, kExprI8Const, 255,
-                kExprSetLocal,0,
-                  kExprI32Sub,kExprGetLocal,0,kExprI8Const,4,
-        kExprI8Const,0])
+            kExprI8Const,255,
+            kExprReturn, kArity1,
+          kExprEnd,
+              kExprGetLocal,0,
+              kExprI8Const,4,
+            kExprI32Sub,
+          kExprSetLocal,0,
+        kExprBr, kArity1, 1,
+        kExprEnd,
+      kExprEnd,
+      kExprI8Const,0
+    ])
     .exportFunc();
 
   return builder.instantiate(null, memory);
 }
 
 function testPokeMemory() {
   var module = genModule(null);
   var buffer = module.exports.memory;
   var main = module.exports.main;
   assertEquals(kMemSize, buffer.byteLength);
@@ skipping 76 matching lines @@
 testOuterMemorySurvivalAcrossGc();
 testOuterMemorySurvivalAcrossGc();
 
 
 function testOOBThrows() {
   var builder = new WasmModuleBuilder();
 
   builder.addMemory(1, 1, true);
   builder.addFunction("geti", [kAstI32, kAstI32, kAstI32])
     .addBody([
-      kExprI32StoreMem, 0, 0, kExprGetLocal, 0, kExprI32LoadMem, 0, 0, kExprGetLocal, 1
+      kExprGetLocal, 0,
+      kExprGetLocal, 1,
+      kExprI32LoadMem, 0, 0,
+      kExprI32StoreMem, 0, 0
     ])
     .exportFunc();
 
   var module = builder.instantiate();
-
   var offset;
 
   function read() { return module.exports.geti(0, offset); }
   function write() { return module.exports.geti(offset, 0); }
 
   for (offset = 0; offset < 65533; offset++) {
     assertEquals(0, read());
     assertEquals(0, write());
   }
 
 
   for (offset = 65534; offset < 66536; offset++) {
     assertTraps(kTrapMemOutOfBounds, read);
     assertTraps(kTrapMemOutOfBounds, write);
   }
 }
 
 testOOBThrows();