[wasm] Disallow WebAssembly.promising with asmjs

thibaudmichaud · V8 LUCI CQ · commit 7ab6d854b2a8 · 2024-08-08T11:27:22.000Z
Throw a TypeError to match the behavior of creating a WebAssembly.promising from a JS function. R=mliedtke@chromium.org Bug: 355015467 Change-Id: Ic565d7cb13c90056e41c2721fd85dffa584b5f15 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5772793 Commit-Queue: Thibaud Michaud <thibaudm@chromium.org> Reviewed-by: Matthias Liedtke <mliedtke@chromium.org> Cr-Commit-Position: refs/heads/main@{#95536}
diff --git a/src/wasm/wasm-js.cc b/src/wasm/wasm-js.cc
@@ -2277,6 +2277,10 @@ void WebAssemblyPromising(const v8::FunctionCallbackInfo<v8::Value>& info) {
   i::DirectHandle<i::WasmExportedFunctionData> data(
       wasm_exported_function->shared()->wasm_exported_function_data(),
       i_isolate);
+  if (data->instance_data()->module_object()->is_asm_js()) {
+    thrower.TypeError("Argument 0 must be a WebAssembly exported function");
+    return;
+  }
   i::Handle<i::JSFunction> result =
       NewPromisingWasmExportedFunction(i_isolate, data, thrower);
   info.GetReturnValue().Set(Utils::ToLocal(i::Cast<i::JSObject>(result)));
diff --git a/test/mjsunit/wasm/stack-switching.js b/test/mjsunit/wasm/stack-switching.js
@@ -8,6 +8,7 @@
 d8.file.execute("test/mjsunit/wasm/wasm-module-builder.js");
 
 (function TestInvalidWrappers() {
+  print(arguments.callee.name);
   assertThrows(() => WebAssembly.promising({}), TypeError,
       /Argument 0 must be a function/);
   assertThrows(() => WebAssembly.promising(() => {}), TypeError,
@@ -16,6 +17,15 @@ d8.file.execute("test/mjsunit/wasm/wasm-module-builder.js");
       /WebAssembly.Suspending must be invoked with 'new'/);
   assertThrows(() => new WebAssembly.Suspending({}), TypeError,
       /Argument 0 must be a function/);
+  function asmModule() {
+    "use asm";
+    function x(v) {
+      v = v | 0;
+    }
+    return x;
+  }
+  assertThrows(() => WebAssembly.promising(asmModule()), TypeError,
+      /Argument 0 must be a WebAssembly exported function/);
 })();
 
 (function TestStackSwitchNoSuspend() {
