[wasm] Rework encoding of local declarations.

test/mjsunit/wasm/module-memory.js

Index: test/mjsunit/wasm/module-memory.js
diff --git a/test/mjsunit/wasm/module-memory.js b/test/mjsunit/wasm/module-memory.js
index b3a3a226e545a4630d49e198b54960023ce870a1..a82aecadeb2f63b601504e2025038e312dec932b 100644
--- a/test/mjsunit/wasm/module-memory.js
+++ b/test/mjsunit/wasm/module-memory.js
@@ -9,8 +9,8 @@ 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,
@@ -20,15 +20,13 @@ function genModule(memory) {
     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,
@@ -132,8 +130,8 @@ 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,
@@ -143,15 +141,12 @@ function testOOBThrows() {
     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,