feedback

Author: sbc100

emcc.py

@@ -1685,7 +1685,7 @@ def include_and_export(name):
     # wasm.  This allows us to set up memory, preload files, etc. even before
     # the wasm module is created.
     if shared.Settings.MINIMAL_RUNTIME or shared.Settings.STANDALONE_WASM:
-      shared.Settings.EXPORT_MEMORY_TO_WASM = 0
+      shared.Settings.MEMORY_DEFINED_IN_WASM = 1
 
     if shared.Settings.WASM_BIGINT:
       shared.Settings.LEGALIZE_JS_FFI = 0

emscripten.py

@@ -623,7 +623,7 @@ def add_standard_wasm_imports(send_items_map):
   # Normally we import these into the wasm (so that JS could use them even
   # before the wasm loads), while in standalone mode we do not depend
   # on JS to create them, but create them in the wasm and export them.
-  if shared.Settings.EXPORT_MEMORY_TO_WASM:
+  if not shared.Settings.MEMORY_DEFINED_IN_WASM:
     memory_import = 'wasmMemory'
     if shared.Settings.MODULARIZE and shared.Settings.USE_PTHREADS:
       # Pthreads assign wasmMemory in their worker startup. In MODULARIZE mode, they cannot assign inside the

src/settings_internal.js

@@ -196,6 +196,8 @@ var STRUCT_INFO = '';
 // If true, building against Emscripten's asm.js/wasm heap memory profiler.
 var MEMORYPROFILER = 0;
 
-// Set to 1 by default for certain cases such as STANDALONE_WASM and
-// MINIMAL_RUNTIME
-var EXPORT_MEMORY_TO_WASM = 1;
+// By default we set this to 0 meaning the wasm file does not defined its own
+// memory and instead the memory is defined in JavaScript.
+// This is set 1 in STANDALONE_WASM or MINIMAL_RUNTIME mode in which case
+// the wasm module exports its memory to JavaScript.
+var MEMORY_DEFINED_IN_WASM = 0;

tools/building.py

@@ -477,8 +477,8 @@ def lld_flags_for_executable(external_symbol_list):
   else:
     cmd.append('--allow-undefined')
 
-  if Settings.EXPORT_MEMORY_TO_WASM:
-    cmd.append('--import-memory')
+  if not Settings.MEMORY_DEFINED_IN_WASM:
+    cmd.append('--importt-memory')
 
   if Settings.USE_PTHREADS:
     cmd.append('--shared-memory')