[wasm] Rework encoding of local declarations.

test/mjsunit/wasm/calls.js

Index: test/mjsunit/wasm/calls.js
diff --git a/test/mjsunit/wasm/calls.js b/test/mjsunit/wasm/calls.js
index 9cd73bb1d98c8785987cd8043630b7e3531c1b94..464149a293a5803d1eb187cc828c84ae95238562 100644
--- a/test/mjsunit/wasm/calls.js
+++ b/test/mjsunit/wasm/calls.js
@@ -7,7 +7,7 @@
 load("test/mjsunit/wasm/wasm-constants.js");
 
 var module = (function () {
-  var kBodySize = 5;
+  var kBodySize = 6;
   var kNameOffset = kHeaderSize + 21 + kBodySize + 1;
 
   return _WASMEXP_.instantiateModule(bytesWithHeader(
@@ -24,6 +24,7 @@ var module = (function () {
     kNameOffset, 0, 0, 0,         // name offset
     kBodySize, 0,
     // -- body
+    kDeclNoLocals,
     kExprI32Sub,                  // --
     kExprGetLocal, 0,             // --
     kExprGetLocal, 1,             // --
@@ -61,7 +62,7 @@ assertEquals(-5555555, module.sub(3333333, 8888888));
 
 
 var module = (function() {
-  var kBodySize = 1;
+  var kBodySize = 2;
   var kNameOffset2 = kHeaderSize + 19 + kBodySize + 1;
 
   return _WASMEXP_.instantiateModule(bytesWithHeader(
@@ -77,6 +78,7 @@ var module = (function() {
     0, 0,                       // signature index
     kNameOffset2, 0, 0, 0,      // name offset
     kBodySize, 0,
+    kDeclNoLocals,
     kExprNop,                   // body
     kDeclEnd,
     'n', 'o', 'p', 0            // name
@@ -112,7 +114,7 @@ assertEquals("function", typeof module.nop);
 assertEquals(undefined, module.nop());
 
 (function testLt() {
-  var kBodySize = 5;
+  var kBodySize = 6;
   var kNameOffset = kHeaderSize + 21 + kBodySize + 1;
 
   var data = bytesWithHeader(
@@ -129,6 +131,7 @@ assertEquals(undefined, module.nop());
     kNameOffset, 0, 0, 0,         // name offset
     kBodySize, 0,
     // -- body
+    kDeclNoLocals,
     kExprF64Lt,                   // --
     kExprGetLocal, 0,             // --
     kExprGetLocal, 1,             // --