[wasm] Rework encoding of local declarations.

src/wasm/encoder.h

 // 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.
 
 #ifndef V8_WASM_ENCODER_H_
 #define V8_WASM_ENCODER_H_
 
 #include "src/signature.h"
 #include "src/zone-containers.h"
 
 #include "src/base/smart-pointers.h"
 
+#include "src/wasm/wasm-macro-gen.h"
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-opcodes.h"
 #include "src/wasm/wasm-result.h"
 
 namespace v8 {
 namespace internal {
 namespace wasm {
 
 class WasmModuleBuilder;
 
 class WasmFunctionEncoder : public ZoneObject {
  public:
   uint32_t HeaderSize() const;
+  uint32_t LocalDeclSize() const {
+    return static_cast<uint32_t>(local_decls_.Size());
+  }
   uint32_t BodySize() const;
   uint32_t NameSize() const;
   void Serialize(byte* buffer, byte** header, byte** body) const;
 
  private:
   WasmFunctionEncoder(Zone* zone, LocalType return_type, bool exported,
                       bool external);
   friend class WasmFunctionBuilder;
   uint16_t signature_index_;
   ZoneVector<LocalType> params_;
-  uint16_t local_i32_count_;
-  uint16_t local_i64_count_;
-  uint16_t local_f32_count_;
-  uint16_t local_f64_count_;
+  LocalDeclEncoder local_decls_;
   bool exported_;
   bool external_;
   ZoneVector<uint8_t> body_;
   ZoneVector<char> name_;
 
-  bool HasLocals() const {
-    return (local_i32_count_ + local_i64_count_ + local_f32_count_ +
-            local_f64_count_) > 0;
-  }
-
   bool HasName() const { return (exported_ || external_) && name_.size() > 0; }
 };
 
 class WasmFunctionBuilder : public ZoneObject {
  public:
   uint16_t AddParam(LocalType type);
   uint16_t AddLocal(LocalType type);
   void ReturnType(LocalType type);
   void EmitCode(const byte* code, uint32_t code_size);
   void EmitCode(const byte* code, uint32_t code_size,
@@ skipping 90 matching lines @@
   SignatureMap signature_map_;
   int start_function_index_;
 };
 
 std::vector<uint8_t> UnsignedLEB128From(uint32_t result);
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_WASM_ENCODER_H_