Add automatic dependency on setTempRet0 for i64-returning functions. NFC (#19377)

Author: sbc100

emcc.py

@@ -2589,15 +2589,8 @@ def check_memory_setting(setting):
   elif options.memory_init_file:
     diagnostics.warning('unsupported', '--memory-init-file is only supported with -sWASM=0')
 
-  if (
-      settings.MAYBE_WASM2JS or
-      settings.AUTODEBUG or
-      settings.LINKABLE or
-      settings.INCLUDE_FULL_LIBRARY or
-      not settings.DISABLE_EXCEPTION_CATCHING or
-      (settings.MAIN_MODULE == 1 and (settings.DYNCALLS or not settings.WASM_BIGINT))
-  ):
-      settings.REQUIRED_EXPORTS += ["getTempRet0", "setTempRet0"]
+  if settings.AUTODEBUG:
+    settings.REQUIRED_EXPORTS += ['setTempRet0']
 
   if settings.LEGALIZE_JS_FFI:
     settings.REQUIRED_EXPORTS += ['__get_temp_ret', '__set_temp_ret']

src/jsifier.js

@@ -265,6 +265,13 @@ function ${name}(${args}) {
       }
 
       const deps = LibraryManager.library[symbol + '__deps'] || [];
+      let sig = LibraryManager.library[symbol + '__sig'];
+      if (!WASM_BIGINT && sig && sig[0] == 'j') {
+        // Without WASM_BIGINT functions that return i64 depend on setTempRet0
+        // to return the upper 32-bits of the result.
+        // See makeReturn64 in parseTools.py.
+        deps.push('setTempRet0');
+      }
 
       let isAsyncFunction = false;
       if (ASYNCIFY) {
@@ -279,7 +286,7 @@ function ${name}(${args}) {
       }
 
       if (symbolsOnly) {
-        if (!isJsOnlySymbol(symbol) && LibraryManager.library.hasOwnProperty(symbol)) {
+        if (LibraryManager.library.hasOwnProperty(symbol)) {
           var value = LibraryManager.library[symbol];
           var resolvedSymbol = symbol;
           // Resolve aliases before looking up deps
@@ -453,7 +460,6 @@ function ${name}(${args}) {
         }
         contentText = `var ${mangled} = ${snippet};`;
       }
-      let sig = LibraryManager.library[symbol + '__sig'];
       // asm module exports are done in emscripten.py, after the asm module is ready. Here
       // we also export library methods as necessary.
       if ((EXPORT_ALL || EXPORTED_FUNCTIONS.has(mangled)) && !isStub) {

src/library_autodebug.js

@@ -17,6 +17,7 @@ mergeInto(LibraryManager.library, {
     out('get_i32 ' + [loc, index, value]);
     return value;
   },
+  $get_i64__deps: ['setTempRet0'],
   $get_i64: function(loc, index, low, high) {
     out('get_i64 ' + [loc, index, low, high]);
     setTempRet0(high);
@@ -42,6 +43,7 @@ mergeInto(LibraryManager.library, {
     out('set_i32 ' + [loc, index, value]);
     return value;
   },
+  $set_i64__deps: ['setTempRet0'],
   $set_i64: function(loc, index, low, high) {
     out('set_i64 ' + [loc, index, low, high]);
     setTempRet0(high);
@@ -71,6 +73,7 @@ mergeInto(LibraryManager.library, {
     out('load_val_i32 ' + [loc, value]);
     return value;
   },
+  $load_val_i64__deps: ['setTempRet0'],
   $load_val_i64: function(loc, low, high) {
     out('load_val_i64 ' + [loc, low, high]);
     setTempRet0(high);
@@ -92,6 +95,7 @@ mergeInto(LibraryManager.library, {
     out('store_val_i32 ' + [loc, value]);
     return value;
   },
+  $store_val_i64__deps: ['setTempRet0'],
   $store_val_i64: function(loc, low, high) {
     out('store_val_i64 ' + [loc, low, high]);
     setTempRet0(high);

src/library_makeDynCall.js

@@ -5,7 +5,7 @@
  */
 
 mergeInto(LibraryManager.library, {
-  $createDyncallWrapper__deps: ['$generateFuncType', '$uleb128Encode'],
+  $createDyncallWrapper__deps: ['$generateFuncType', '$uleb128Encode', 'setTempRet0'],
   $createDyncallWrapper: function(sig) {
     var sections = [];
     var prelude = [

test/core/js_library_i64_params.js

@@ -1,6 +1,6 @@
 TestLibrary = {
   jscall__deps: i53ConversionDeps,
-  jscall__sig: 'ij',
+  jscall__sig: 'jj',
   jscall: function({{{ defineI64Param('foo') }}}) {
     {{{ receiveI64ParamAsI53('foo', `(err('overflow'), ${makeReturn64('42')})`) }}}
     err('js:got:       ' + foo);

test/other/metadce/test_metadce_cxx_except.exports

@@ -12,7 +12,6 @@ dynCall_iiiiijj
 dynCall_jiiii
 dynCall_jiji
 dynCall_viijii
-getTempRet0
 main
 memory
 setTempRet0

test/other/metadce/test_metadce_cxx_except.size

@@ -1 +1 @@
-166271
+166245

test/other/metadce/test_metadce_cxx_mangle.exports

@@ -14,7 +14,6 @@ dynCall_jiiii
 dynCall_jiji
 dynCall_viijii
 free
-getTempRet0
 main
 memory
 setTempRet0

test/other/metadce/test_metadce_cxx_mangle.size

@@ -1 +1 @@
-221359
+221332

test/test_core.py

@@ -9704,7 +9704,6 @@ def test_syscall_intercept(self):
   def test_js_library_i64_params(self):
     # Tests the defineI64Param and receiveI64ParamAsI53 helpers that are
     # used to recieve i64 argument in syscalls.
-    self.set_setting('EXPORTED_RUNTIME_METHODS', ['setTempRet0'])
     self.emcc_args += ['--js-library=' + test_file('core/js_library_i64_params.js')]
     self.do_core_test('js_library_i64_params.c')