Revert of [wasm] further simplification of WasmCompiledModule

src/wasm/wasm-module.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_MODULE_H_
 #define V8_WASM_MODULE_H_
 
 #include <memory>
 
 #include "src/api.h"
@@ skipping 356 matching lines @@
                                                                      \
   bool has_##NAME() const { return get(ID)->Is##TYPE(); }            \
                                                                      \
   void reset_##NAME() { set_undefined(ID); }
 
 #define WCM_OBJECT(TYPE, NAME) WCM_OBJECT_OR_WEAK(TYPE, NAME, kID_##NAME)
 
 #define WCM_SMALL_NUMBER(TYPE, NAME)                               \
   TYPE NAME() const {                                              \
     return static_cast<TYPE>(Smi::cast(get(kID_##NAME))->value()); \
+  }                                                                \
+                                                                   \
+  void set_##NAME(TYPE value) {                                    \
+    set(kID_##NAME, Smi::FromInt(static_cast<int>(value)));        \
+  }
+
+#define WCM_LARGE_NUMBER(TYPE, NAME)                                          \
+  TYPE NAME() const {                                                         \
+    return static_cast<TYPE>(HeapNumber::cast(get(kID_##NAME))->value());     \
+  }                                                                           \
+                                                                              \
+  void set_##NAME(TYPE value) {                                               \
+    HeapNumber::cast(get(kID_##NAME))->set_value(static_cast<double>(value)); \
   }
 
 #define WCM_WEAK_LINK(TYPE, NAME)                        \
   WCM_OBJECT_OR_WEAK(WeakCell, weak_##NAME, kID_##NAME); \
                                                          \
   Handle<TYPE> NAME() const {                            \
     return handle(TYPE::cast(weak_##NAME()->value()));   \
   }
 
 #define WCM_PROPERTY_TABLE(MACRO)                     \
   MACRO(OBJECT, FixedArray, code_table)               \
   MACRO(OBJECT, FixedArray, import_data)              \
   MACRO(OBJECT, FixedArray, exports)                  \
   MACRO(OBJECT, FixedArray, startup_function)         \
   MACRO(OBJECT, FixedArray, indirect_function_tables) \
   MACRO(OBJECT, String, module_bytes)                 \
   MACRO(OBJECT, ByteArray, function_names)            \
-  MACRO(SMALL_NUMBER, uint32_t, min_memory_pages)     \
+  MACRO(LARGE_NUMBER, uint32_t, min_required_memory)  \
   MACRO(OBJECT, FixedArray, data_segments_info)       \
   MACRO(OBJECT, ByteArray, data_segments)             \
-  MACRO(SMALL_NUMBER, uint32_t, globals_size)         \
-  MACRO(OBJECT, JSArrayBuffer, heap)                  \
+  MACRO(LARGE_NUMBER, uint32_t, globals_size)         \
+  MACRO(LARGE_NUMBER, uint32_t, mem_size)             \
+  MACRO(OBJECT, JSArrayBuffer, mem_start)             \
   MACRO(SMALL_NUMBER, bool, export_memory)            \
   MACRO(SMALL_NUMBER, ModuleOrigin, origin)           \
   MACRO(WEAK_LINK, WasmCompiledModule, next_instance) \
   MACRO(WEAK_LINK, WasmCompiledModule, prev_instance) \
   MACRO(WEAK_LINK, JSObject, owning_instance)         \
   MACRO(WEAK_LINK, JSObject, module_object)
 
  private:
   enum PropertyIndices {
 #define INDICES(IGNORE1, IGNORE2, NAME) kID_##NAME,
     WCM_PROPERTY_TABLE(INDICES) Count
 #undef INDICES
   };
 
  public:
-  static Handle<WasmCompiledModule> New(Isolate* isolate,
-                                        uint32_t min_memory_pages,
-                                        uint32_t globals_size,
-                                        bool export_memory,
-                                        ModuleOrigin origin);
+  static Handle<WasmCompiledModule> New(Isolate* isolate) {
+    Handle<FixedArray> ret =
+        isolate->factory()->NewFixedArray(PropertyIndices::Count, TENURED);
+    Handle<HeapNumber> number;
+#define WCM_INIT_OBJECT(IGNORE1, IGNORE2)
+#define WCM_INIT_WEAK_LINK(IGNORE1, IGNORE2)
+#define WCM_INIT_SMALL_NUMBER(IGNORE1, IGNORE2)
+#define WCM_INIT_LARGE_NUMBER(IGNORE, NAME)                          \
+  number = isolate->factory()->NewHeapNumber(0.0, MUTABLE, TENURED); \
+  ret->set(kID_##NAME, *number);
+
+#define INITIALIZER(KIND, TYPE, NAME) WCM_INIT_##KIND(TYPE, NAME)
+    WCM_PROPERTY_TABLE(INITIALIZER)
+#undef INITIALIZER
+    return handle(WasmCompiledModule::cast(*ret));
+  }
 
   static Handle<WasmCompiledModule> Clone(Isolate* isolate,
                                           Handle<WasmCompiledModule> module) {
     Handle<WasmCompiledModule> ret = Handle<WasmCompiledModule>::cast(
         isolate->factory()->CopyFixedArray(module));
+    Handle<HeapNumber> number =
+        isolate->factory()->NewHeapNumber(0.0, MUTABLE, TENURED);
+    ret->set(kID_mem_size, *number);
+    ret->set_mem_size(module->mem_size());
     return ret;
   }
 
-  uint32_t mem_size() const {
-    DCHECK(has_heap());
-    return heap()->byte_length()->Number();
-  }
-
-  uint32_t default_mem_size() const {
-    return min_memory_pages() * WasmModule::kPageSize;
-  }
-
 #define DECLARATION(KIND, TYPE, NAME) WCM_##KIND(TYPE, NAME)
   WCM_PROPERTY_TABLE(DECLARATION)
 #undef DECLARATION
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(WasmCompiledModule);
 };
 
 // Extract a function name from the given wasm object.
 // Returns "<WASM UNNAMED>" if the function is unnamed or the name is not a
@@ skipping 79 matching lines @@
                             int instance_count);
 void ValidateModuleState(Isolate* isolate, Handle<JSObject> module_obj);
 void ValidateOrphanedInstance(Isolate* isolate, Handle<JSObject> instance);
 
 }  // namespace testing
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_WASM_MODULE_H_