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

src/wasm/wasm-module-builder.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 "src/signature.h"
 
 #include "src/handles.h"
 #include "src/v8.h"
 #include "src/zone/zone-containers.h"
 
@@ skipping 237 matching lines @@
                                       FunctionSig* sig) {
   imports_.push_back({AddSignature(sig), name, name_length});
   return static_cast<uint32_t>(imports_.size() - 1);
 }
 
 void WasmModuleBuilder::MarkStartFunction(WasmFunctionBuilder* function) {
   start_function_index_ = function->func_index();
 }
 
 uint32_t WasmModuleBuilder::AddGlobal(LocalType type, bool exported,
-                                      bool mutability,
-                                      const WasmInitExpr& init) {
-  globals_.push_back({type, exported, mutability, init});
+                                      bool mutability) {
+  globals_.push_back({type, exported, mutability});
   return static_cast<uint32_t>(globals_.size() - 1);
 }
 
 void WasmModuleBuilder::WriteTo(ZoneBuffer& buffer) const {
   uint32_t exports = 0;
 
   // == Emit magic =============================================================
   TRACE("emit magic\n");
   buffer.write_u32(kWasmMagic);
   buffer.write_u32(kWasmVersion);
@@ skipping 67 matching lines @@
   }
 
   // == Emit globals ===========================================================
   if (globals_.size() > 0) {
     size_t start = EmitSection(kGlobalSectionCode, buffer);
     buffer.write_size(globals_.size());
 
     for (auto global : globals_) {
       buffer.write_u8(WasmOpcodes::LocalTypeCodeFor(global.type));
       buffer.write_u8(global.mutability ? 1 : 0);
-      switch (global.init.kind) {
-        case WasmInitExpr::kI32Const: {
-          DCHECK_EQ(kAstI32, global.type);
-          const byte code[] = {WASM_I32V_5(global.init.val.i32_const)};
+      switch (global.type) {
+        case kAstI32: {
+          static const byte code[] = {WASM_I32V_1(0)};
           buffer.write(code, sizeof(code));
           break;
         }
-        case WasmInitExpr::kI64Const: {
-          DCHECK_EQ(kAstI64, global.type);
-          const byte code[] = {WASM_I64V_10(global.init.val.i64_const)};
+        case kAstF32: {
+          static const byte code[] = {WASM_F32(0)};
           buffer.write(code, sizeof(code));
           break;
         }
-        case WasmInitExpr::kF32Const: {
-          DCHECK_EQ(kAstF32, global.type);
-          const byte code[] = {WASM_F32(global.init.val.f32_const)};
+        case kAstI64: {
+          static const byte code[] = {WASM_I64V_1(0)};
           buffer.write(code, sizeof(code));
           break;
         }
-        case WasmInitExpr::kF64Const: {
-          DCHECK_EQ(kAstF64, global.type);
-          const byte code[] = {WASM_F64(global.init.val.f64_const)};
+        case kAstF64: {
+          static const byte code[] = {WASM_F64(0.0)};
           buffer.write(code, sizeof(code));
           break;
         }
-        case WasmInitExpr::kGlobalIndex: {
-          const byte code[] = {kExprGetGlobal,
-                               U32V_5(global.init.val.global_index)};
-          buffer.write(code, sizeof(code));
-          break;
-        }
-        default: {
-          // No initializer, emit a default value.
-          switch (global.type) {
-            case kAstI32: {
-              const byte code[] = {WASM_I32V_1(0)};
-              buffer.write(code, sizeof(code));
-              break;
-            }
-            case kAstI64: {
-              const byte code[] = {WASM_I64V_1(0)};
-              buffer.write(code, sizeof(code));
-              break;
-            }
-            case kAstF32: {
-              const byte code[] = {WASM_F32(0.0)};
-              buffer.write(code, sizeof(code));
-              break;
-            }
-            case kAstF64: {
-              const byte code[] = {WASM_F64(0.0)};
-              buffer.write(code, sizeof(code));
-              break;
-            }
-            default:
-              UNREACHABLE();
-          }
-        }
+        default:
+          UNREACHABLE();
       }
       buffer.write_u8(kExprEnd);
     }
     FixupSection(buffer, start);
   }
 
   // == emit exports ===========================================================
   if (exports > 0) {
     size_t start = EmitSection(kExportSectionCode, buffer);
     buffer.write_u32v(exports);
@@ skipping 70 matching lines @@
                      function->name_.size());
       }
       buffer.write_u8(0);
     }
     FixupSection(buffer, start);
   }
 }
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8