[wasm] Rework encoding of local declarations.

test/unittests/wasm/encoder-unittest.cc

 // 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.
 
 #include "test/unittests/test-utils.h"
 
 #include "src/v8.h"
 
 #include "src/wasm/ast-decoder.h"
 #include "src/wasm/encoder.h"
@@ skipping 68 matching lines @@
   function->EmitCode(code, sizeof(code), local_indices, 1);
   code[1] = static_cast<uint8_t>(local_f64);
   function->EmitCode(code, sizeof(code), local_indices, 1);
 
   WasmFunctionEncoder* f = function->Build(&zone, builder);
   ZoneVector<uint8_t> buffer_vector(f->HeaderSize() + f->BodySize(), &zone);
   byte* buffer = &buffer_vector[0];
   byte* header = buffer;
   byte* body = buffer + f->HeaderSize();
   f->Serialize(buffer, &header, &body);
-  for (size_t i = 0; i < 7; i++) {
-    CHECK_EQ(i, static_cast<size_t>(*(buffer + 2 * i + f->HeaderSize() + 1)));
-  }
 }
 
 
 TEST_F(EncoderTest, Function_Builder_Indexing_Variable_Width) {
   Zone zone;
   WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
   uint16_t f_index = builder->AddFunction();
   WasmFunctionBuilder* function = builder->FunctionAt(f_index);
   for (size_t i = 0; i < 128; i++) {
     AddLocal(function, kAstF32);
   }
   AddLocal(function, kAstI32);
 
   WasmFunctionEncoder* f = function->Build(&zone, builder);
   ZoneVector<uint8_t> buffer_vector(f->HeaderSize() + f->BodySize(), &zone);
   byte* buffer = &buffer_vector[0];
   byte* header = buffer;
   byte* body = buffer + f->HeaderSize();
   f->Serialize(buffer, &header, &body);
   body = buffer + f->HeaderSize();
-  for (size_t i = 0; i < 127; i++) {
-    CHECK_EQ(kExprGetLocal, static_cast<size_t>(*(body + 2 * i)));
-    CHECK_EQ(i + 1, static_cast<size_t>(*(body + 2 * i + 1)));
-  }
-  CHECK_EQ(kExprGetLocal, static_cast<size_t>(*(body + 2 * 127)));
-  CHECK_EQ(0x80, static_cast<size_t>(*(body + 2 * 127 + 1)));
-  CHECK_EQ(0x01, static_cast<size_t>(*(body + 2 * 127 + 2)));
-  CHECK_EQ(kExprGetLocal, static_cast<size_t>(*(body + 2 * 127 + 3)));
-  CHECK_EQ(0x00, static_cast<size_t>(*(body + 2 * 127 + 4)));
 }
 
 
 TEST_F(EncoderTest, LEB_Functions) {
   byte leb_value[5] = {0, 0, 0, 0, 0};
   CheckReadValue(leb_value, 0, 1, kNoError);
   CheckWriteValue(0, 1, leb_value);
   leb_value[0] = 23;
   CheckReadValue(leb_value, 23, 1, kNoError);
   CheckWriteValue(23, 1, leb_value);
@@ skipping 11 matching lines @@
   leb_value[0] = 0x80;
   leb_value[1] = 0x80;
   leb_value[2] = 0x80;
   leb_value[3] = 0x80;
   leb_value[4] = 0x80;
   CheckReadValue(leb_value, -1, -1, kInvalidLEB128);
 }
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8