[wasm] Memory is exported on the module.exports object.

src/wasm/wasm-module.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/macro-assembler.h"
 #include "src/objects.h"
 #include "src/v8.h"
 
 #include "src/simulator.h"
 
@@ skipping 360 matching lines @@
     if (!AllocateMemory(&thrower, isolate, &instance)) {
       return MaybeHandle<JSObject>();
     }
   } else {
     SetMemory(&instance, memory);
   }
   instance.js_object->SetInternalField(kWasmMemArrayBuffer,
                                        *instance.mem_buffer);
   LoadDataSegments(this, instance.mem_start, instance.mem_size);
 
-  if (mem_export) {
-    // Export the memory as a named property.
-    Handle<String> name = factory->InternalizeUtf8String("memory");
-    JSObject::AddProperty(instance.js_object, name, instance.mem_buffer,
-                          READ_ONLY);
-  }
-
   //-------------------------------------------------------------------------
   // Allocate the globals area if necessary.
   //-------------------------------------------------------------------------
   if (!AllocateGlobals(&thrower, isolate, &instance)) {
     return MaybeHandle<JSObject>();
   }
   if (!instance.globals_buffer.is_null()) {
     instance.js_object->SetInternalField(kWasmGlobalsArrayBuffer,
                                          *instance.globals_buffer);
   }
@@ skipping 73 matching lines @@
   }
 
   // Second pass: patch all direct call sites.
   linker.Link(instance.function_table, this->function_table);
   instance.js_object->SetInternalField(kWasmModuleFunctionTable,
                                        Smi::FromInt(0));
 
   //-------------------------------------------------------------------------
   // Create and populate the exports object.
   //-------------------------------------------------------------------------
-  if (export_table.size() > 0) {
+  if (export_table.size() > 0 || mem_export) {
     index = 0;
     // Create the "exports" object.
     Handle<JSFunction> object_function = Handle<JSFunction>(
         isolate->native_context()->object_function(), isolate);
     Handle<JSObject> exports_object =
         factory->NewJSObject(object_function, TENURED);
     Handle<String> exports_name = factory->InternalizeUtf8String("exports");
     JSObject::AddProperty(instance.js_object, exports_name, exports_object,
                           READ_ONLY);
 
     // Compile wrappers and add them to the exports object.
     for (const WasmExport& exp : export_table) {
       if (thrower.error()) break;
       const char* cstr = GetName(exp.name_offset);
       Handle<String> name = factory->InternalizeUtf8String(cstr);
       Handle<Code> code = linker.GetFunctionCode(exp.func_index);
       Handle<JSFunction> function = compiler::CompileJSToWasmWrapper(
           isolate, &module_env, name, code, instance.js_object, exp.func_index);
       JSObject::AddProperty(exports_object, name, function, READ_ONLY);
     }
+
+    if (mem_export) {
+      // Export the memory as a named property.
+      Handle<String> name = factory->InternalizeUtf8String("memory");
+      JSObject::AddProperty(exports_object, name, instance.mem_buffer,
+                            READ_ONLY);
+    }
   }
 
   // Run the start function if one was specified.
   if (this->start_function_index >= 0) {
     HandleScope scope(isolate);
     uint32_t index = static_cast<uint32_t>(this->start_function_index);
     Handle<String> name = isolate->factory()->NewStringFromStaticChars("start");
     Handle<Code> code = linker.GetFunctionCode(index);
     Handle<JSFunction> jsfunc = compiler::CompileJSToWasmWrapper(
         isolate, &module_env, name, code, instance.js_object, index);
@@ skipping 135 matching lines @@
   }
   if (result->IsHeapNumber()) {
     return static_cast<int32_t>(HeapNumber::cast(*result)->value());
   }
   thrower.Error("WASM.compileRun() failed: Return value should be number");
   return -1;
 }
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8