[wasm] Rework encoding of local declarations.

test/mjsunit/wasm/import-table.js

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Flags: --expose-wasm
 
 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;
 
   var ffi = new Object();
   ffi.fun = func;
 
   var data = bytesWithHeader(
     // signatures
     kDeclSignatures, 1,
     2, kAstI32, kAstF64, kAstF64, // (f64,f64) -> int
     // -- main function
     kDeclFunctions,
     1,
     kDeclFunctionName | kDeclFunctionExport,
     0, 0,
     kNameMainOffset, 0, 0, 0,    // name offset
     kBodySize, 0,
     // main body
+    kDeclNoLocals,
     kExprCallImport, 0,          // --
     kExprGetLocal, 0,            // --
     kExprGetLocal, 1,            // --
     // imports
     kDeclImportTable,
     1,
     0, 0,                        // sig index
     0, 0, 0, 0,                  // module name offset
     kNameFunOffset, 0, 0, 0,     // function name offset
     // names
@@ skipping 146 matching lines @@
 testCallImport(returnValue(null), checkReturn(0));
 testCallImport(returnValue("0"), checkReturn(0));
 testCallImport(returnValue("-77"), checkReturn(-77));
 
 var objWithValueOf = {valueOf: function() { return 198; }}
 
 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;
 
   var ffi = new Object();
 
   var passed_length = -1;
   var passed_a = -1;
   var passed_b = -1;
   var args_a = -1;
   var args_b = -1;
@@ skipping 15 matching lines @@
     kDeclFunctions, 2,
     kDeclFunctionName | kDeclFunctionImport,
     0, 0,                       // signature index
     kNameFunOffset, 0, 0, 0,    // name offset
     // -- main function
     kDeclFunctionName | kDeclFunctionExport,
     1, 0,                       // signature index
     kNameMainOffset, 0, 0, 0,   // name offset
     kBodySize, 0,               // body size
     // main body
+    kDeclNoLocals,
     kExprBlock, 2,              // --
     kExprCallFunction, 0,       // --
     kExprGetLocal, 0,           // --
     kExprGetLocal, 1,           // --
     kExprI8Const, 99,           // --
     // names
     kDeclEnd,
     'f', 'u', 'n', 0,           // --
     'm', 'a', 'i', 'n', 0       // --
   );
@@ skipping 37 matching lines @@
 
 
 testCallBinopVoid(kAstI32);
 // TODO testCallBinopVoid(kAstI64);
 testCallBinopVoid(kAstF32);
 testCallBinopVoid(kAstF64);
 
 
 
 function testCallPrint() {
-  var kBodySize = 10;
+  var kBodySize = 11;
   var kNamePrintOffset = kHeaderSize + 10 + 7 + 7 + 9 + kBodySize + 1;
   var kNameMainOffset = kNamePrintOffset + 6;
 
   var ffi = new Object();
   ffi.print = print;
 
   var data = bytesWithHeader(
     // -- signatures
     kDeclSignatures, 2,
     1, kAstStmt, kAstI32,       // i32->void
     1, kAstStmt, kAstF64,       // f64->int
     kDeclFunctions, 3,
     // -- import print i32
     kDeclFunctionName | kDeclFunctionImport,
     0, 0,                       // signature index
     kNamePrintOffset, 0, 0, 0,  // name offset
     // -- import print f64
     kDeclFunctionName | kDeclFunctionImport,
     1, 0,                       // signature index
     kNamePrintOffset, 0, 0, 0,  // name offset
     // -- decl main
     kDeclFunctionName | kDeclFunctionExport,
     1, 0,                       // signature index
     kNameMainOffset, 0, 0, 0,   // name offset
     kBodySize, 0,               // body size
     // main body
+    kDeclNoLocals,
     kExprBlock, 2,              // --
     kExprCallFunction, 0,       // --
     kExprI8Const, 97,           // --
     kExprCallFunction, 1,       // --
     kExprGetLocal, 0,           // --
     // names
     kDeclEnd,
     'p', 'r', 'i', 'n', 't', 0, // --
     'm', 'a', 'i', 'n', 0       // --
   );
 
   var module = _WASMEXP_.instantiateModule(data, ffi);
 
   assertEquals("function", typeof module.main);
 
   for (var i = -9; i < 900; i += 6.125) {
       module.main(i);
   }
 }
 
 testCallPrint();
 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;
 
   var ffi = new Object();
   ffi.foo = foo;
   ffi.bar = bar;
 
   var data = bytesWithHeader(
     // signatures
     kDeclSignatures, 1,
     0, kAstI32,                  // void -> i32
     // -- main function
     kDeclFunctions,
     1,
     kDeclFunctionName | kDeclFunctionExport,
     0, 0,
     kNameMainOffset, 0, 0, 0,    // name offset
     kBodySize, 0,
     // main body
+    kDeclNoLocals,
     kExprI32Add,                 // --
     kExprCallImport, 0,          // --
     kExprCallImport, 1,          // --
     // imports
     kDeclImportTable,
     2,
     0, 0,                        // sig index
     0, 0, 0, 0,                  // module name offset
     kNameFooOffset, 0, 0, 0,     // function name offset
     0, 0,                        // sig index
     0, 0, 0, 0,                  // module name offset
     kNameBarOffset, 0, 0, 0,     // function name offset
     // names
     kDeclEnd,
     'f', 'o', 'o', 0,            // --
     'b', 'a', 'r', 0,            // --
     'm', 'a', 'i', 'n', 0        // --
   );
 
   var module = _WASMEXP_.instantiateModule(data, ffi);
 
   assertEquals("function", typeof module.main);
 
   assertEquals(expected, module.main());
 }
 
 testCallImport2(function() { return 33; }, function () { return 44; }, 77);