[wasm] Rework encoding of local declarations.

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");
 
 var kMemSize = 4096;
 
 function genModule(memory) {
-  var kBodySize = 27;
-  var kNameMainOffset = kHeaderSize + 28 + kBodySize + 1;
+  var kBodySize = 30;
+  var kNameMainOffset = kHeaderSize + 20 + kBodySize + 1;
 
   var data = bytesWithHeader(
     kDeclMemory,
     12, 12, 1,                  // memory
     // -- signatures
     kDeclSignatures, 1,
     1, kAstI32, kAstI32,        // int->int
     // -- main function
     kDeclFunctions, 1,
-    kDeclFunctionLocals | kDeclFunctionName | kDeclFunctionExport,
+    kDeclFunctionName | kDeclFunctionExport,
     0, 0,
     kNameMainOffset, 0, 0, 0,   // name offset
-    1, 0,                       // local int32 count
-    0, 0,                       // local int64 count
-    0, 0,                       // local float32 count
-    0, 0,                       // local float64 count
     kBodySize, 0,               // code size
     // main body: while(i) { if(mem[i]) return -1; i -= 4; } return 0;
+    1,
+    1, kAstI32,
     kExprBlock,2,
       kExprLoop,1,
         kExprIf,
           kExprGetLocal,0,
           kExprBr, 0,
             kExprIfElse,
               kExprI32LoadMem,0,kExprGetLocal,0,
               kExprBr,2, kExprI8Const, 255,
               kExprSetLocal,0,
                 kExprI32Sub,kExprGetLocal,0,kExprI8Const,4,
@@ skipping 83 matching lines @@
   }
 }
 
 testOuterMemorySurvivalAcrossGc();
 testOuterMemorySurvivalAcrossGc();
 testOuterMemorySurvivalAcrossGc();
 testOuterMemorySurvivalAcrossGc();
 
 
 function testOOBThrows() {
-  var kBodySize = 8;
-  var kNameMainOffset = kHeaderSize + 29 + kBodySize + 1;
+  var kBodySize = 11;
+  var kNameMainOffset = kHeaderSize + 21 + kBodySize + 1;
 
   var data = bytesWithHeader(
     kDeclMemory,
     12, 12, 1,                     // memory = 4KB
     // -- signatures
     kDeclSignatures, 1,
     2, kAstI32, kAstI32, kAstI32,  // int->int
     // -- main function
     kDeclFunctions, 1,
-    kDeclFunctionLocals | kDeclFunctionName | kDeclFunctionExport,
+    kDeclFunctionName | kDeclFunctionExport,
     0, 0,
     kNameMainOffset, 0, 0, 0,      // name offset
-    1, 0,                          // local int32 count
-    0, 0,                          // local int64 count
-    0, 0,                          // local float32 count
-    0, 0,                          // local float64 count
     kBodySize, 0,                  // code size
     // geti: return mem[a] = mem[b]
+    1, 1, kAstI32,
     kExprI32StoreMem, 0, kExprGetLocal, 0, kExprI32LoadMem, 0, kExprGetLocal, 1,
     // names
     kDeclEnd,
     'g','e','t','i', 0             //  --
   );
 
   var memory = null;
   var module = _WASMEXP_.instantiateModule(data, null, memory);
 
   var offset;
 
   function read() { return module.geti(0, offset); }
   function write() { return module.geti(offset, 0); }
 
   for (offset = 0; offset < 4092; offset++) {
     assertEquals(0, read());
     assertEquals(0, write());
   }
 
 
   for (offset = 4093; offset < 4124; offset++) {
     assertTraps(kTrapMemOutOfBounds, read);
     assertTraps(kTrapMemOutOfBounds, write);
   }
 }
 
 testOOBThrows();