From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 14 Jul 2024 10:01:03 +0000 (+0200)
Subject: [3.13] gh-121698 Emscripten: Use updated WebAssembly type reflection proposal (GH... 
X-Git-Tag: v3.13.0b4~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f17057dab10b2114614d9d59291ebbc0bc9ab787;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-121698 Emscripten: Use updated WebAssembly type reflection proposal (GH-121699) (GH-121745)

(cherry picked from commit cae15267166e217822e3c58ac22b7817162f323a)

Co-authored-by: Hood Chatham <roberthoodchatham@gmail.com>
---

diff --git a/Python/emscripten_trampoline.c b/Python/emscripten_trampoline.c
index 2a80ec4f18d7..960c6b4a2ef9 100644
--- a/Python/emscripten_trampoline.c
+++ b/Python/emscripten_trampoline.c
@@ -10,7 +10,17 @@
  * https://github.com/GoogleChromeLabs/wasm-feature-detect/blob/main/src/detectors/type-reflection/index.js
  */
 EM_JS(int, _PyEM_detect_type_reflection, (), {
-    return "Function" in WebAssembly;
+    if (!("Function" in WebAssembly)) {
+        return false;
+    }
+    if (WebAssembly.Function.type) {
+        // Node v20
+        Module.PyEM_CountArgs = (func) => WebAssembly.Function.type(wasmTable.get(func)).parameters.length;
+    } else {
+        // Node >= 22, v8-based browsers
+        Module.PyEM_CountArgs = (func) => wasmTable.get(func).type().parameters.length;
+    }
+    return true;
 });
 
 void
@@ -43,7 +53,7 @@ EM_JS(int, _PyEM_CountFuncParams, (PyCFunctionWithKeywords func),
     if (n !== undefined) {
         return n;
     }
-    n = WebAssembly.Function.type(wasmTable.get(func)).parameters.length;
+    n = Module.PyEM_CountArgs(func);
     _PyEM_CountFuncParams.cache.set(func, n);
     return n;
 }