Update JSPI code to handle change in type reflection spec

Resolves pyodide#4378
hoodmane · Jan 16, 2024 · b1ff271 · b1ff271
1 parent 4f2c037
commit b1ff271
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/cpython/patches/0008-Make-Emscripten-trampolines-work-with-JSPI.patch b/cpython/patches/0008-Make-Emscripten-trampolines-work-with-JSPI.patch
@@ -270,7 +270,7 @@ index 0000000000..d2d24a6e0a
 +  if (n !== undefined) {
 +    return n;
 +  }
-+  n = WebAssembly.Function.type(wasmTable.get(func)).parameters.length;
++  n = wasmFunctionType(wasmTable.get(func)).parameters.length;
 +  _PyEM_CountFuncParams.cache.set(func, n);
 +  return n;
 +}

diff --git a/src/core/pre.js b/src/core/pre.js
@@ -99,3 +99,13 @@ Module.iterObject = function* (object) {
     }
   }
 };
+
+function wasmFunctionType(wasm_func) {
+  if (!WebAssembly.Function) {
+    throw new Error("No type reflection");
+  }
+  if (WebAssembly.Function.type) {
+    return WebAssembly.Function.type(wasm_func);
+  }
+  return wasm_func.type();
+}
diff --git a/src/core/stack_switching/suspenders.mjs b/src/core/stack_switching/suspenders.mjs
@@ -154,7 +154,7 @@ export function createPromising(wasm_func) {
   if (promisingFunctionMap.has(wasm_func)) {
     return promisingFunctionMap.get(wasm_func);
   }
-  const type = WebAssembly.Function.type(wasm_func);
+  const type = wasmFunctionType(wasm_func);
   const module = getPromisingModule(type);
   const instance = new WebAssembly.Instance(module, {
     e: { i: wasm_func, s: suspenderGlobal },