Use for..of in a few places when it avoids an extra hasOwnProperty call. NFC (emscripten-core#20822)

sbc100 · web-flow · commit 421df76e954a · 2023-12-04T13:38:42.000-08:00
diff --git a/src/library_dylink.js b/src/library_dylink.js
@@ -286,10 +286,10 @@ var LibraryDylink = {
 #if DYLINK_DEBUG
     dbg('reportUndefinedSymbols');
 #endif
-    for (var symName in GOT) {
-      if (GOT[symName].value == 0) {
+    for (var [symName, entry] of Object.entries(GOT)) {
+      if (entry.value == 0) {
         var value = resolveGlobalSymbol(symName, true).sym;
-        if (!value && !GOT[symName].required) {
+        if (!value && !entry.required) {
           // Ignore undefined symbols that are imported as weak.
 #if DYLINK_DEBUG
           dbg(`ignoring undefined weak symbol: ${symName}`);
@@ -304,15 +304,15 @@ var LibraryDylink = {
 #endif
         if (typeof value == 'function') {
           /** @suppress {checkTypes} */
-          GOT[symName].value = {{{ to64('addFunction(value, value.sig)') }}};
+          entry.value = {{{ to64('addFunction(value, value.sig)') }}};
 #if DYLINK_DEBUG == 2
-          dbg(`assigning table entry for : ${symName} -> ${GOT[symName].value}`);
+          dbg(`assigning table entry for : ${symName} -> ${entry.value}`);
 #endif
         } else if (typeof value == 'number') {
-          GOT[symName].value = {{{ to64('value') }}};
+          entry.value = {{{ to64('value') }}};
 #if MEMORY64
         } else if (typeof value == 'bigint') {
-          GOT[symName].value = value;
+          entry.value = value;
 #endif
         } else {
           throw new Error(`bad export type for '${symName}': ${typeof value}`);
@@ -529,13 +529,10 @@ var LibraryDylink = {
   $mergeLibSymbols__deps: ['$isSymbolDefined'],
   $mergeLibSymbols: (exports, libName) => {
     // add symbols into global namespace TODO: weak linking etc.
-    for (var sym in exports) {
-      if (!exports.hasOwnProperty(sym)) {
-        continue;
-      }
+    for (var [sym, exp] of Object.entries(exports)) {
 #if ASSERTIONS == 2
       if (isSymbolDefined(sym)) {
-        var curr = wasmImports[sym], next = exports[sym];
+        var curr = wasmImports[sym], next = exp;
         // don't warn on functions - might be odr, linkonce_odr, etc.
         if (!(typeof curr == 'function' && typeof next == 'function')) {
           err(`warning: symbol '${sym}' from '${libName}' already exists (duplicate symbol? or weak linking, which isn't supported yet?)`); // + [curr, ' vs ', next]);
@@ -552,11 +549,11 @@ var LibraryDylink = {
       const setImport = (target) => {
 #if ASYNCIFY
         if (target in asyncifyStubs) {
-          asyncifyStubs[target] = exports[sym]
+          asyncifyStubs[target] = exp;
         }
 #endif
         if (!isSymbolDefined(target)) {
-          wasmImports[target] = exports[sym];
+          wasmImports[target] = exp;
         }
       }
       setImport(sym);
@@ -575,7 +572,7 @@ var LibraryDylink = {
 #endif
 
       if (sym.startsWith('dynCall_') && !Module.hasOwnProperty(sym)) {
-        Module[sym] = exports[sym];
+        Module[sym] = exp;
       }
     }
   },
diff --git a/src/library_memfs.js b/src/library_memfs.js
@@ -216,10 +216,7 @@ addToLibrary({
       },
       readdir(node) {
         var entries = ['.', '..'];
-        for (var key in node.contents) {
-          if (!node.contents.hasOwnProperty(key)) {
-            continue;
-          }
+        for (var key of Object.keys(node.contents)) {
           entries.push(key);
         }
         return entries;
diff --git a/src/library_workerfs.js b/src/library_workerfs.js
@@ -116,10 +116,7 @@ addToLibrary({
       },
       readdir(node) {
         var entries = ['.', '..'];
-        for (var key in node.contents) {
-          if (!node.contents.hasOwnProperty(key)) {
-            continue;
-          }
+        for (var key of Object.keys(node.contents)) {
           entries.push(key);
         }
         return entries;
diff --git a/src/utility.js b/src/utility.js
@@ -23,14 +23,11 @@ function dump(item) {
     return '// ' + JSON.stringify(item, null, '  ').replace(/\n/g, '\n// ');
   } catch (e) {
     const ret = [];
-    for (const i in item) {
-      if (Object.prototype.hasOwnProperty.call(item, i)) {
-        const j = item[i];
-        if (typeof j == 'string' || typeof j == 'number') {
-          ret.push(`${i}: ${j}`);
-        } else {
-          ret.push(`${i}: [?]`);
-        }
+    for (const [i, j] of Object.entries(item)) {
+      if (typeof j == 'string' || typeof j == 'number') {
+        ret.push(`${i}: ${j}`);
+      } else {
+        ret.push(`${i}: [?]`);
       }
     }
     return ret.join(',\n');
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.jssize b/test/other/metadce/test_metadce_cxx_ctors1.jssize
@@ -1 +1 @@
-24952
+24942
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.jssize b/test/other/metadce/test_metadce_cxx_ctors2.jssize
@@ -1 +1 @@
-24920
+24910
diff --git a/test/other/metadce/test_metadce_cxx_except.jssize b/test/other/metadce/test_metadce_cxx_except.jssize
@@ -1 +1 @@
-29082
+29072
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.jssize b/test/other/metadce/test_metadce_cxx_except_wasm.jssize
@@ -1 +1 @@
-24727
+24717
diff --git a/test/other/metadce/test_metadce_cxx_mangle.jssize b/test/other/metadce/test_metadce_cxx_mangle.jssize
@@ -1 +1 @@
-29082
+29072
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.jssize b/test/other/metadce/test_metadce_cxx_noexcept.jssize
@@ -1 +1 @@
-24952
+24942
diff --git a/test/other/metadce/test_metadce_files_js_fs.jssize b/test/other/metadce/test_metadce_files_js_fs.jssize
@@ -1 +1 @@
-19851
+19841
diff --git a/test/other/metadce/test_metadce_hello_dylink.jssize b/test/other/metadce/test_metadce_hello_dylink.jssize
@@ -1 +1 @@
-14647
+14652
