From 0f1f1f6d8de5a554322c77bb0aeb9a3b483799bc Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Wed, 20 Dec 2023 13:20:47 -0800
Subject: [PATCH] Avoiding exporting ready promise. NFC

This promise is defined and used only in MODULARIZE mode and the
promise itself is returned, so there is no need to export it on the
Module object.
---
 src/parseTools.js    |  6 +++---
 src/shell.js         |  4 ++--
 src/shell_minimal.js |  4 ++--
 tools/link.py        | 12 +++++-------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/parseTools.js b/src/parseTools.js
index ef91fc93198b..5425ec644c57 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -935,7 +935,7 @@ function to64(x) {
 
 // Add assertions to catch common errors when using the Promise object we
 // create on Module.ready() and return from MODULARIZE Module() invocations.
-function addReadyPromiseAssertions(promise) {
+function addReadyPromiseAssertions() {
   // Warn on someone doing
   //
   //  var instance = Module();
@@ -948,8 +948,8 @@ function addReadyPromiseAssertions(promise) {
   const warningEnding = ' on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js';
   const res = JSON.stringify(properties);
   return res + `.forEach((prop) => {
-  if (!Object.getOwnPropertyDescriptor(${promise}, prop)) {
-    Object.defineProperty(${promise}, prop, {
+  if (!Object.getOwnPropertyDescriptor(readyPromise, prop)) {
+    Object.defineProperty(readyPromise, prop, {
       get: () => abort('You are getting ' + prop + '${warningEnding}'),
       set: () => abort('You are setting ' + prop + '${warningEnding}'),
     });
diff --git a/src/shell.js b/src/shell.js
index 5e6550c2aaec..f13677e778bf 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -66,12 +66,12 @@ var Module = typeof {{{ EXPORT_NAME }}} != 'undefined' ? {{{ EXPORT_NAME }}} : {
 #if MODULARIZE
 // Set up the promise that indicates the Module is initialized
 var readyPromiseResolve, readyPromiseReject;
-Module['ready'] = new Promise((resolve, reject) => {
+var readyPromise = new Promise((resolve, reject) => {
   readyPromiseResolve = resolve;
   readyPromiseReject = reject;
 });
 #if ASSERTIONS
-{{{ addReadyPromiseAssertions("Module['ready']") }}}
+{{{ addReadyPromiseAssertions() }}}
 #endif
 #endif
 
diff --git a/src/shell_minimal.js b/src/shell_minimal.js
index 5dcfd039a1f9..e066fbc63cb1 100644
--- a/src/shell_minimal.js
+++ b/src/shell_minimal.js
@@ -36,12 +36,12 @@ var Module = {{{ EXPORT_NAME }}};
 #if MODULARIZE && EXPORT_READY_PROMISE
 // Set up the promise that indicates the Module is initialized
 var readyPromiseResolve, readyPromiseReject;
-Module['ready'] = new Promise((resolve, reject) => {
+var readyPromise = new Promise((resolve, reject) => {
   readyPromiseResolve = resolve;
   readyPromiseReject = reject;
 });
 #if ASSERTIONS
-{{{ addReadyPromiseAssertions("Module['ready']") }}}
+{{{ addReadyPromiseAssertions() }}}
 #endif
 #endif
 
diff --git a/tools/link.py b/tools/link.py
index ec7f930801b6..5a1285d7d77c 100644
--- a/tools/link.py
+++ b/tools/link.py
@@ -2312,14 +2312,12 @@ def modularize():
      shared.target_environment_may_be('web'):
     async_emit = 'async '
 
-  # Return the incoming `moduleArg`.  This is is equeivielt to the `Module` var within the
-  # generated code but its not run through closure minifiection so we can reference it in
-  # the the return statement.
-  return_value = 'moduleArg'
   if settings.WASM_ASYNC_COMPILATION:
-    return_value += '.ready'
-  if not settings.EXPORT_READY_PROMISE:
-    return_value = '{}'
+    return_value = 'readyPromise'
+    if not settings.EXPORT_READY_PROMISE:
+      return_value = '{}'
+  else:
+    return_value = 'Module'
 
   # TODO: Remove when https://bugs.webkit.org/show_bug.cgi?id=223533 is resolved.
   if async_emit != '' and settings.EXPORT_NAME == 'config':