[wasm] Rework encoding of local declarations.

test/mjsunit/wasm/import-table.js

Index: test/mjsunit/wasm/import-table.js
diff --git a/test/mjsunit/wasm/import-table.js b/test/mjsunit/wasm/import-table.js
index 53860bf20644db9d670f2478842971b1281f5c59..a4d0a8cf56807d05089d07abaf9b5344adf00264 100644
--- a/test/mjsunit/wasm/import-table.js
+++ b/test/mjsunit/wasm/import-table.js
@@ -7,7 +7,7 @@
 load("test/mjsunit/wasm/wasm-constants.js");
 
 function testCallImport(func, check) {
-  var kBodySize = 6;
+  var kBodySize = 7;
   var kNameFunOffset = kHeaderSize + 29 + kBodySize + 1;
   var kNameMainOffset = kNameFunOffset + 4;
 
@@ -26,6 +26,7 @@ function testCallImport(func, check) {
     kNameMainOffset, 0, 0, 0,    // name offset
     kBodySize, 0,
     // main body
+    kDeclNoLocals,
     kExprCallImport, 0,          // --
     kExprGetLocal, 0,            // --
     kExprGetLocal, 1,            // --
@@ -192,7 +193,7 @@ testCallImport(returnValue(objWithValueOf), checkReturn(198));
 
 
 function testCallBinopVoid(type, func, check) {
-  var kBodySize = 10;
+  var kBodySize = 11;
   var kNameFunOffset = kHeaderSize + 28 + kBodySize + 1;
   var kNameMainOffset = kNameFunOffset + 4;
 
@@ -228,6 +229,7 @@ function testCallBinopVoid(type, func, check) {
     kNameMainOffset, 0, 0, 0,   // name offset
     kBodySize, 0,               // body size
     // main body
+    kDeclNoLocals,
     kExprBlock, 2,              // --
     kExprCallFunction, 0,       // --
     kExprGetLocal, 0,           // --
@@ -285,7 +287,7 @@ testCallBinopVoid(kAstF64);
 
 
 function testCallPrint() {
-  var kBodySize = 10;
+  var kBodySize = 11;
   var kNamePrintOffset = kHeaderSize + 10 + 7 + 7 + 9 + kBodySize + 1;
   var kNameMainOffset = kNamePrintOffset + 6;
 
@@ -312,6 +314,7 @@ function testCallPrint() {
     kNameMainOffset, 0, 0, 0,   // name offset
     kBodySize, 0,               // body size
     // main body
+    kDeclNoLocals,
     kExprBlock, 2,              // --
     kExprCallFunction, 0,       // --
     kExprI8Const, 97,           // --
@@ -337,7 +340,7 @@ testCallPrint();
 
 
 function testCallImport2(foo, bar, expected) {
-  var kBodySize = 5;
+  var kBodySize = 6;
   var kNameFooOffset = kHeaderSize + 37 + kBodySize + 1;
   var kNameBarOffset = kNameFooOffset + 4;
   var kNameMainOffset = kNameBarOffset + 4;
@@ -358,6 +361,7 @@ function testCallImport2(foo, bar, expected) {
     kNameMainOffset, 0, 0, 0,    // name offset
     kBodySize, 0,
     // main body
+    kDeclNoLocals,
     kExprI32Add,                 // --
     kExprCallImport, 0,          // --
     kExprCallImport, 1,          // --