From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 js/src/jit-test/tests/parser/bug1887176.js      | 46 +++++++++++++++++++++++++
 js/src/jit-test/tests/parser/dumpStencil-02.js  |  8 +++++
 js/src/jit-test/tests/parser/module-filename.js | 13 +++++++
 3 files changed, 67 insertions(+)
 create mode 100644 js/src/jit-test/tests/parser/bug1887176.js
 create mode 100644 js/src/jit-test/tests/parser/dumpStencil-02.js
 create mode 100644 js/src/jit-test/tests/parser/module-filename.js

(limited to 'js/src/jit-test/tests/parser')

diff --git a/js/src/jit-test/tests/parser/bug1887176.js b/js/src/jit-test/tests/parser/bug1887176.js
new file mode 100644
index 0000000000..bea2db519b
--- /dev/null
+++ b/js/src/jit-test/tests/parser/bug1887176.js
@@ -0,0 +1,46 @@
+
+// This tests a case where TokenStreamAnyChars::fillExceptingContext
+// mishandled a wasm frame, leading to an assertion failure.
+
+if (!wasmIsSupported())
+    quit();
+
+const v0 = `
+    const o6 = {
+        f() {
+            function F2() {
+                if (!new.target) { throw 'must be called with new'; }
+            }
+            return F2();
+            return {}; // This can be anything, but it must be present
+        },
+    };
+
+    const o7 = {
+        "main": o6,
+    };
+
+    const v15 = new WebAssembly.Module(wasmTextToBinary(\`
+    (module
+        (import "main" "f" (func))
+        (func (export "go")
+            call 0
+        )
+    )\`));
+    const v16 = new WebAssembly.Instance(v15, o7);
+    v16.exports.go();
+`;
+
+const o27 = {
+    // Both "fileName" and null are necessary
+    "fileName": null,
+};
+
+let caught = false;
+try {
+    evaluate(v0, o27);
+} catch (e) {
+    assertEq(e, "must be called with new");
+    caught = true;
+}
+assertEq(caught, true);
diff --git a/js/src/jit-test/tests/parser/dumpStencil-02.js b/js/src/jit-test/tests/parser/dumpStencil-02.js
new file mode 100644
index 0000000000..e21962c36b
--- /dev/null
+++ b/js/src/jit-test/tests/parser/dumpStencil-02.js
@@ -0,0 +1,8 @@
+let caught = false;
+try {
+  dumpStencil("export var z;", { module : true, lineNumber: 0 });
+} catch (e) {
+  caught = true;
+  assertEq(e.message.includes("Module cannot be compiled with lineNumber == 0"), true);
+}
+assertEq(caught, true);
diff --git a/js/src/jit-test/tests/parser/module-filename.js b/js/src/jit-test/tests/parser/module-filename.js
new file mode 100644
index 0000000000..59017dd674
--- /dev/null
+++ b/js/src/jit-test/tests/parser/module-filename.js
@@ -0,0 +1,13 @@
+load(libdir + "asserts.js");
+
+compileToStencil("", { fileName: "", module: true });
+assertThrowsInstanceOf(() => {
+  compileToStencil("", { fileName: null, module: true });
+}, Error);
+
+if (helperThreadCount() > 0) {
+  offThreadCompileModuleToStencil("", { fileName: "", module: true });
+  assertThrowsInstanceOf(() => {
+    offThreadCompileModuleToStencil("", { fileName: null, module: true });
+  }, Error);
+}
-- 
cgit v1.2.3