Simplify unexported runtime symbol checks (#17378)

`unexportedRuntimeSymbol` can be used for both function and numbers
that are not exported so `unexportedRuntimeFunction` is redundant.

Author: sbc100

src/modules.js

@@ -380,7 +380,7 @@ function exportRuntime() {
   // in ASSERTIONS mode we show a useful error if it is used without
   // being exported. how we show the message depends on whether it's
   // a function (almost all of them) or a number.
-  function maybeExport(name, isNumber) {
+  function maybeExport(name) {
     // if requested to be exported, export it
     if (EXPORTED_RUNTIME_METHODS_SET.has(name)) {
       let exported = name;
@@ -401,20 +401,14 @@ function exportRuntime() {
     if (ASSERTIONS) {
       // check if it already exists, to support EXPORT_ALL and other cases
       const fssymbol = isExportedByForceFilesystem(name);
-      if (isNumber) {
-        return `unexportedRuntimeSymbol('${name}', ${fssymbol});`;
-      } else {
-        return `unexportedRuntimeFunction('${name}', ${fssymbol});`;
-      }
+      return `unexportedRuntimeSymbol('${name}', ${fssymbol});`;
     }
   }
 
-  function maybeExportNumber(name) {
-    return maybeExport(name, true);
-  }
-
   // All possible runtime elements that can be exported
   let runtimeElements = [
+    'ALLOC_NORMAL',
+    'ALLOC_STACK',
     'ccall',
     'cwrap',
     'allocate',
@@ -532,22 +526,16 @@ function exportRuntime() {
     }
   }
 
-  const runtimeNumbers = [
-    'ALLOC_NORMAL',
-    'ALLOC_STACK',
-  ];
   if (ASSERTIONS) {
     // check all exported things exist, warn about typos
     const runtimeElementsSet = new Set(runtimeElements);
-    const runtimeNumbersSet = new Set(runtimeNumbers);
     for (const name of EXPORTED_RUNTIME_METHODS_SET) {
-      if (!runtimeElementsSet.has(name) && !runtimeNumbersSet.has(name)) {
+      if (!runtimeElementsSet.has(name)) {
         printErr(`warning: invalid item in EXPORTED_RUNTIME_METHODS: ${name}`);
       }
     }
   }
   let exports = runtimeElements.map((name) => maybeExport(name));
-  exports = exports.concat(runtimeNumbers.map((name) => maybeExportNumber(name)));
   exports = exports.filter((name) => name);
   return exports.join('\n') + '\n' + addMissingLibraryStubs();
 }

src/runtime_debug.js

@@ -44,12 +44,6 @@ function unexportedRuntimeSymbol(sym, isFSSybol) {
     });
   }
 }
-
-function unexportedRuntimeFunction(sym, isFSSybol) {
-  if (!Object.getOwnPropertyDescriptor(Module, sym)) {
-    Module[sym] = () => abort(unexportedMessage(sym, isFSSybol));
-  }
-}
 #endif
 
 #if RUNTIME_DEBUG

tests/other/metadce/test_metadce_hello_O0.jssize

@@ -1 +1 @@
-26811
+26693

tests/other/metadce/test_metadce_minimal_O0.jssize

@@ -1 +1 @@
-21502
+21384

tests/other/test_unoptimized_code_size.js.size

@@ -1 +1 @@
-93804
+93171