Move warnOnce to JS library (#17423)

Once we disable LEGACY_RUNTIME by default we will see that code size
wins.

Author: sbc100

ChangeLog.md

@@ -49,6 +49,7 @@ See docs/process.md for more on how version tagging works.
    - writeAsciiToMemory
    - intArrayFromString
    - intArrayToString
+   - warnOnce
   However, they all still available by default due to a new setting called
   `LEGACY_RUNTIME` which is enabled by default.  When `LEGACY_RUNTIME` is
   disabled (which it may be in the future) these symbols would only be included

emcc.py

@@ -1848,16 +1848,21 @@ def phase_linker_setup(options, state, newargs, user_settings):
   if settings.CLOSURE_WARNINGS not in ['quiet', 'warn', 'error']:
     exit_with_error('Invalid option -sCLOSURE_WARNINGS=%s specified! Allowed values are "quiet", "warn" or "error".' % settings.CLOSURE_WARNINGS)
 
-  # Include dynCall() function by default in DYNCALLS builds in classic runtime; in MINIMAL_RUNTIME, must add this explicitly.
-  if settings.DYNCALLS and not settings.MINIMAL_RUNTIME:
-    settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$dynCall']
-
   if not settings.BOOTSTRAPPING_STRUCT_INFO:
-    if settings.SAFE_HEAP:
-      settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$getValue_safe', '$setValue_safe']
     if not settings.MINIMAL_RUNTIME:
+      if settings.DYNCALLS:
+        # Include dynCall() function by default in DYNCALLS builds in classic runtime; in MINIMAL_RUNTIME, must add this explicitly.
+        settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$dynCall']
+
+      if settings.ASSERTIONS and not settings.EXIT_RUNTIME:
+        # "checkUnflushedContent()" depends on warnOnce
+        settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$warnOnce']
+
       settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$getValue', '$setValue']
 
+    if settings.SAFE_HEAP:
+      settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$getValue_safe', '$setValue_safe']
+
   if settings.MAIN_MODULE:
     assert not settings.SIDE_MODULE
     if settings.MAIN_MODULE == 1:

src/library.js

@@ -2360,15 +2360,13 @@ mergeInto(LibraryManager.library, {
     return nowIsMonotonic;
   },
 
-#if MINIMAL_RUNTIME
   $warnOnce: function(text) {
     if (!warnOnce.shown) warnOnce.shown = {};
     if (!warnOnce.shown[text]) {
       warnOnce.shown[text] = 1;
       err(text);
     }
   },
-#endif
 
   // Returns [parentFuncArguments, functionName, paramListName]
   $traverseStack: function(args) {
@@ -2400,11 +2398,7 @@ mergeInto(LibraryManager.library, {
     return [args, funcname, str];
   },
 
-  emscripten_get_callstack_js__deps: ['$traverseStack', '$jsStackTrace',
-#if MINIMAL_RUNTIME
-    , '$warnOnce'
-#endif
-  ],
+  emscripten_get_callstack_js__deps: ['$traverseStack', '$jsStackTrace', '$warnOnce'],
   emscripten_get_callstack_js__docs: '/** @param {number=} flags */',
   emscripten_get_callstack_js: function(flags) {
     var callstack = jsStackTrace();
@@ -3299,9 +3293,14 @@ mergeInto(LibraryManager.library, {
     throw 'unwind';
   },
 
+  emscripten_force_exit__deps: [
+#if !EXIT_RUNTIME && ASSERTIONS
+    '$warnOnce',
+#endif
 #if MINIMAL_RUNTIME
-  emscripten_force_exit__deps: ['exit'],
+    'exit',
 #endif
+  ],
   emscripten_force_exit__proxy: 'sync',
   emscripten_force_exit__sig: 'vi',
   emscripten_force_exit: function(status) {
@@ -3651,5 +3650,6 @@ DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push(
   '$writeAsciiToMemory',
   '$intArrayFromString',
   '$intArrayToString',
+  '$warnOnce',
 );
 #endif

src/library_browser.js

@@ -10,6 +10,7 @@ var LibraryBrowser = {
     '$setMainLoop',
     '$callUserCallback',
     '$safeSetTimeout',
+    '$warnOnce',
     'emscripten_set_main_loop_timing',
   ],
   $Browser__postset: 'Module["requestFullscreen"] = function Module_requestFullscreen(lockPointer, resizeCanvas) { Browser.requestFullscreen(lockPointer, resizeCanvas) };\n' + // exports

src/library_pthread.js

@@ -776,9 +776,7 @@ var LibraryPThread = {
     return spawnThread(threadParams);
   },
 
-#if MINIMAL_RUNTIME
   emscripten_check_blocking_allowed__deps: ['$warnOnce'],
-#endif
   emscripten_check_blocking_allowed: function() {
 #if ASSERTIONS || IN_TEST_HARNESS || !MINIMAL_RUNTIME || !ALLOW_BLOCKING_ON_MAIN_THREAD
 #if ENVIRONMENT_MAY_BE_NODE

src/modules.js

@@ -411,7 +411,6 @@ function exportRuntime() {
     // MINIMAL_RUNTIME has moved these functions to library_strings.js
     runtimeElements = runtimeElements.concat([
       'run',
-      'warnOnce',
       'ExitStatus',
     ]);
   }

src/support.js

@@ -9,14 +9,6 @@ var POINTER_SIZE = {{{ MEMORY64 ? 8 : 4 }}};
 
 {{{ getNativeTypeSize }}}
 
-function warnOnce(text) {
-  if (!warnOnce.shown) warnOnce.shown = {};
-  if (!warnOnce.shown[text]) {
-    warnOnce.shown[text] = 1;
-    err(text);
-  }
-}
-
 #include "runtime_debug.js"
 
 var tempRet0 = 0;

tests/other/metadce/test_metadce_hello_O0.jssize

@@ -1 +1 @@
-26717
+26713

tests/other/test_unoptimized_code_size.js.size

@@ -1 +1 @@
-94927
+94954

tests/other/test_unoptimized_code_size_no_asserts.js.size

@@ -1 +1 @@
-56491
+56517