[wasm] Rework encoding of local declarations.

test/mjsunit/wasm/ffi.js

Index: test/mjsunit/wasm/ffi.js
diff --git a/test/mjsunit/wasm/ffi.js b/test/mjsunit/wasm/ffi.js
index 1cc23210e824dc18c3133f7e8f36746e2169568f..2ee4fc8760b8b60e107272401db4298fd7687641 100644
--- a/test/mjsunit/wasm/ffi.js
+++ b/test/mjsunit/wasm/ffi.js
@@ -7,7 +7,7 @@
 load("test/mjsunit/wasm/wasm-constants.js");
 
 function testCallFFI(func, check) {
-  var kBodySize = 6;
+  var kBodySize = 7;
   var kNameFunOffset = kHeaderSize + 24 + kBodySize + 1;
   var kNameMainOffset = kNameFunOffset + 4;
 
@@ -29,6 +29,7 @@ function testCallFFI(func, check) {
     kNameMainOffset, 0, 0, 0,   // name offset
     kBodySize, 0,
     // main body
+    kDeclNoLocals,              // --
     kExprCallFunction, 0,       // --
     kExprGetLocal, 0,           // --
     kExprGetLocal, 1,           // --
@@ -189,7 +190,7 @@ testCallFFI(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;
 
@@ -225,6 +226,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,           // --
@@ -282,7 +284,7 @@ testCallBinopVoid(kAstF64);
 
 
 function testCallPrint() {
-  var kBodySize = 10;
+  var kBodySize = 11;
   var kNamePrintOffset = kHeaderSize + 10 + 7 + 7 + 9 + kBodySize + 1;
   var kNameMainOffset = kNamePrintOffset + 6;
 
@@ -309,6 +311,7 @@ function testCallPrint() {
     kNameMainOffset, 0, 0, 0,   // name offset
     kBodySize, 0,               // body size
     // main body
+    kDeclNoLocals,              // --
     kExprBlock, 2,              // --
     kExprCallFunction, 0,       // --
     kExprI8Const, 97,           // --