Revert of [wasm] Refactor import handling for 0xC.

src/wasm/wasm-module-builder.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_WASM_MODULE_BUILDER_H_
 #define V8_WASM_WASM_MODULE_BUILDER_H_
 
 #include "src/signature.h"
 #include "src/zone/zone-containers.h"
 
@@ skipping 194 matching lines @@
  public:
   explicit WasmModuleBuilder(Zone* zone);
 
   // Building methods.
   uint32_t AddImport(const char* name, int name_length, FunctionSig* sig);
   void SetImportName(uint32_t index, const char* name, int name_length) {
     imports_[index].name = name;
     imports_[index].name_length = name_length;
   }
   WasmFunctionBuilder* AddFunction(FunctionSig* sig = nullptr);
-  uint32_t AddGlobal(LocalType type, bool exported, bool mutability = true,
-                     const WasmInitExpr& init = WasmInitExpr());
+  uint32_t AddGlobal(LocalType type, bool exported, bool mutability = true);
   void AddDataSegment(const byte* data, uint32_t size, uint32_t dest);
   uint32_t AddSignature(FunctionSig* sig);
   void AddIndirectFunction(uint32_t index);
   void MarkStartFunction(WasmFunctionBuilder* builder);
 
   // Writing methods.
   void WriteTo(ZoneBuffer& buffer) const;
 
   struct CompareFunctionSigs {
     bool operator()(FunctionSig* a, FunctionSig* b) const;
   };
   typedef ZoneMap<FunctionSig*, uint32_t, CompareFunctionSigs> SignatureMap;
 
   Zone* zone() { return zone_; }
 
   FunctionSig* GetSignature(uint32_t index) { return signatures_[index]; }
 
  private:
   struct WasmFunctionImport {
     uint32_t sig_index;
     const char* name;
     int name_length;
   };
 
   struct WasmGlobal {
     LocalType type;
     bool exported;
     bool mutability;
-    WasmInitExpr init;
   };
 
   struct WasmDataSegment {
     ZoneVector<byte> data;
     uint32_t dest;
   };
 
   friend class WasmFunctionBuilder;
   Zone* zone_;
   ZoneVector<FunctionSig*> signatures_;
   ZoneVector<WasmFunctionImport> imports_;
   ZoneVector<WasmFunctionBuilder*> functions_;
   ZoneVector<WasmDataSegment> data_segments_;
   ZoneVector<uint32_t> indirect_functions_;
   ZoneVector<WasmGlobal> globals_;
   SignatureMap signature_map_;
   int start_function_index_;
 };
 
 inline FunctionSig* WasmFunctionBuilder::signature() {
   return builder_->signatures_[signature_index_];
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_WASM_WASM_MODULE_BUILDER_H_