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

src/wasm/module-decoder.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/wasm/module-decoder.h"
 
 #include "src/base/functional.h"
 #include "src/base/platform/platform.h"
 #include "src/macro-assembler.h"
 #include "src/objects.h"
@@ skipping 300 matching lines @@
             // ===== Imported memory =========================================
             //            import->index =
             //            static_cast<uint32_t>(module->memories.size());
             // TODO(titzer): imported memories
             break;
           }
           case kExternalGlobal: {
             // ===== Imported global =========================================
             import->index = static_cast<uint32_t>(module->globals.size());
             module->globals.push_back(
-                {kAstStmt, false, WasmInitExpr(), 0, true, false});
+                {kAstStmt, false, NO_INIT, 0, true, false});
             WasmGlobal* global = &module->globals.back();
             global->type = consume_value_type();
             global->mutability = consume_u8("mutability") != 0;
             break;
           }
           default:
             error(pos, pos, "unknown import kind 0x%02x", import->kind);
             break;
         }
       }
@@ skipping 60 matching lines @@
     }
 
     // ===== Global section ==================================================
     if (section_iter.section_code() == kGlobalSectionCode) {
       uint32_t globals_count = consume_u32v("globals count");
       module->globals.reserve(SafeReserve(globals_count));
       for (uint32_t i = 0; ok() && i < globals_count; ++i) {
         TRACE("DecodeGlobal[%d] module+%d\n", i,
               static_cast<int>(pc_ - start_));
         // Add an uninitialized global and pass a pointer to it.
-        module->globals.push_back(
-            {kAstStmt, false, WasmInitExpr(), 0, false, false});
+        module->globals.push_back({kAstStmt, false, NO_INIT, 0, false, false});
         WasmGlobal* global = &module->globals.back();
         DecodeGlobalInModule(module, i, global);
       }
       section_iter.advance();
     }
 
     // ===== Export section ==================================================
     if (section_iter.section_code() == kExportSectionCode) {
       uint32_t export_table_count = consume_u32v("export table count");
       module->export_table.reserve(SafeReserve(export_table_count));
@@ skipping 125 matching lines @@
     }
 
     // ===== Data section ====================================================
     if (section_iter.section_code() == kDataSectionCode) {
       uint32_t data_segments_count = consume_u32v("data segments count");
       module->data_segments.reserve(SafeReserve(data_segments_count));
       for (uint32_t i = 0; ok() && i < data_segments_count; ++i) {
         TRACE("DecodeDataSegment[%d] module+%d\n", i,
               static_cast<int>(pc_ - start_));
         module->data_segments.push_back({
-            WasmInitExpr(),  // dest_addr
-            0,               // source_offset
-            0                // source_size
+            NO_INIT,  // dest_addr
+            0,        // source_offset
+            0         // source_size
         });
         WasmDataSegment* segment = &module->data_segments.back();
         DecodeDataSegmentInModule(module, segment);
       }
       section_iter.advance();
     }
 
     // ===== Name section ====================================================
     if (section_iter.section_code() == kNameSectionCode) {
       const byte* pos = pc_;
@@ skipping 79 matching lines @@
   uint32_t off(const byte* ptr) { return static_cast<uint32_t>(ptr - start_); }
 
   // Decodes a single global entry inside a module starting at {pc_}.
   void DecodeGlobalInModule(WasmModule* module, uint32_t index,
                             WasmGlobal* global) {
     global->type = consume_value_type();
     global->mutability = consume_u8("mutability") != 0;
     const byte* pos = pc();
     global->init = consume_init_expr(module, kAstStmt);
     switch (global->init.kind) {
-      case WasmInitExpr::kGlobalIndex: {
-        uint32_t other_index = global->init.val.global_index;
-        if (other_index >= index) {
+      case WasmInitExpr::kGlobalIndex:
+        if (global->init.val.global_index >= index) {
           error("invalid global index in init expression");
-        } else if (module->globals[other_index].type != global->type) {
-          error(pos, pos,
-                "type mismatch in global initialization "
-                "(from global #%u), expected %s, got %s",
-                other_index, WasmOpcodes::TypeName(global->type),
-                WasmOpcodes::TypeName(module->globals[other_index].type));
+        } else if (module->globals[index].type != global->type) {
+          error("type mismatch in global initialization");
         }
         break;
-      }
       default:
         if (global->type != TypeOf(module, global->init)) {
           error(pos, pos,
                 "type error in global initialization, expected %s, got %s",
                 WasmOpcodes::TypeName(global->type),
                 WasmOpcodes::TypeName(TypeOf(module, global->init)));
         }
     }
   }
 
@@ skipping 441 matching lines @@
     decoder.consume_bytes(size);
   }
   if (decoder.more()) decoder.error("unexpected additional bytes");
 
   return decoder.toResult(std::move(table));
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8