[wasm] Rework encoding of local declarations.

test/mjsunit/wasm/indirect-calls.js

Index: test/mjsunit/wasm/indirect-calls.js
diff --git a/test/mjsunit/wasm/indirect-calls.js b/test/mjsunit/wasm/indirect-calls.js
index e6fb9bca1b7b1d6e70ac369aa51daac47ca742ef..082f4af2551d19daf3ca7de7691df0880e7afd8d 100644
--- a/test/mjsunit/wasm/indirect-calls.js
+++ b/test/mjsunit/wasm/indirect-calls.js
@@ -9,8 +9,8 @@ load("test/mjsunit/wasm/wasm-constants.js");
 var module = (function () {
   var kFuncWithBody = 9;
   var kFuncImported = 7;
-  var kBodySize1 = 5;
-  var kBodySize2 = 8;
+  var kBodySize1 = 6;
+  var kBodySize2 = 9;
   var kFuncTableSize = 8;
   var kSubOffset = kHeaderSize + 13 + kFuncWithBody + kBodySize1 + kFuncImported + kFuncWithBody + kBodySize2 + kFuncTableSize + 1;
   var kAddOffset = kSubOffset + 4;
@@ -30,6 +30,7 @@ var module = (function () {
     0, 0,                         // signature offset
     kSubOffset, 0, 0, 0,          // name offset
     kBodySize1, 0,                // body size
+    kDeclNoLocals,                // --
     kExprI32Sub,                  // --
     kExprGetLocal, 0,             // --
     kExprGetLocal, 1,             // --
@@ -42,6 +43,7 @@ var module = (function () {
     1, 0,                         // signature offset
     kMainOffset, 0, 0, 0,         // name offset
     kBodySize2, 0,                // body size
+    kDeclNoLocals,
     kExprCallIndirect, 0,
     kExprGetLocal, 0,
     kExprGetLocal, 1,