Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 118 insertions, 0 deletions

diff --git a/js/src/jit-test/tests/profiler/native-trampoline-2.js b/js/src/jit-test/tests/profiler/native-trampoline-2.js
new file mode 100644
index 0000000000..a85913431b
--- /dev/null
+++ b/js/src/jit-test/tests/profiler/native-trampoline-2.js
@@ -0,0 +1,7 @@
+let arr = [1, 2, 3, 4, 5, 6, 7, 8];
+arr.sort((x, y) => {
+  enableGeckoProfilingWithSlowAssertions();
+  readGeckoProfilingStack();
+  return y - x;
+});
+assertEq(arr.toString(), "8,7,6,5,4,3,2,1");
diff --git a/js/src/jit-test/tests/profiler/native-trampoline-3.js b/js/src/jit-test/tests/profiler/native-trampoline-3.js
new file mode 100644
index 0000000000..16fe547051
--- /dev/null
+++ b/js/src/jit-test/tests/profiler/native-trampoline-3.js
@@ -0,0 +1,32 @@
+// |jit-test| skip-if: !wasmIsSupported()
+
+// Use a Wasm module to get the following stack frames:
+//
+//  .. => array sort trampoline => wasmfunc comparator (Wasm) => comparator (JS)
+
+let binary = wasmTextToBinary(`
+(module
+  (import "" "comparator" (func $comparator (param i32) (param i32) (result i32)))
+  (func $wasmfunc
+    (export "wasmfunc")
+    (param $x i32)
+    (param $y i32)
+    (result i32)
+    (return (call $comparator (local.get $x) (local.get $y)))
+  )
+)`);
+let mod = new WebAssembly.Module(binary);
+let instance = new WebAssembly.Instance(mod, {"": {comparator}});
+
+function comparator(x, y) {
+  readGeckoProfilingStack();
+  return y - x;
+}
+
+enableGeckoProfilingWithSlowAssertions();
+
+for (let i = 0; i < 20; i++) {
+  let arr = [3, 1, 2, -1, 0, 4];
+  arr.sort(instance.exports.wasmfunc);
+  assertEq(arr.toString(), "4,3,2,1,0,-1");
+}
diff --git a/js/src/jit-test/tests/profiler/native-trampoline.js b/js/src/jit-test/tests/profiler/native-trampoline.js
new file mode 100644
index 0000000000..e140874a15
--- /dev/null
+++ b/js/src/jit-test/tests/profiler/native-trampoline.js
@@ -0,0 +1,40 @@
+enableGeckoProfilingWithSlowAssertions();
+
+function testBasic() {
+    var arr = [2, -1];
+    var cmp = function(x, y) {
+        readGeckoProfilingStack();
+        return x - y;
+    };
+    for (var i = 0; i < 20; i++) {
+        arr.sort(cmp);
+    }
+}
+testBasic();
+
+function testRectifierFrame() {
+    var arr = [2, -1];
+    var cmp = function(x, y, z, a) {
+        readGeckoProfilingStack();
+        return x - y;
+    };
+    for (var i = 0; i < 20; i++) {
+        arr.sort(cmp);
+    }
+}
+testRectifierFrame();
+
+function testRectifierFrameCaller() {
+    var o = {};
+    var calls = 0;
+    Object.defineProperty(o, "length", {get: function() {
+        calls++;
+        readGeckoProfilingStack();
+        return 0;
+    }});
+    for (var i = 0; i < 20; i++) {
+        Array.prototype.sort.call(o);
+    }
+    assertEq(calls, 20);
+}
+testRectifierFrameCaller();
diff --git a/js/src/jit-test/tests/profiler/wasm-to-js-1.js b/js/src/jit-test/tests/profiler/wasm-to-js-1.js
new file mode 100644
index 0000000000..2ce48f391c
--- /dev/null
+++ b/js/src/jit-test/tests/profiler/wasm-to-js-1.js
@@ -0,0 +1,20 @@
+// |jit-test| skip-if: !wasmIsSupported(); --fast-warmup
+function sample() {
+    enableGeckoProfiling();
+    readGeckoProfilingStack();
+    disableGeckoProfiling();
+}
+const text = `(module
+    (import "m" "f" (func $f))
+    (func (export "test")
+    (call $f)
+))`;
+const bytes = wasmTextToBinary(text);
+const mod = new WebAssembly.Module(bytes);
+const imports = {"m": {"f": sample}};
+const instance = new WebAssembly.Instance(mod, imports);
+sample();
+for (let i = 0; i < 5; i++) {
+    gc(this, "shrinking");
+    instance.exports.test();
+}
diff --git a/js/src/jit-test/tests/profiler/wasm-to-js-2.js b/js/src/jit-test/tests/profiler/wasm-to-js-2.js
new file mode 100644
index 0000000000..3949c3a587
--- /dev/null
+++ b/js/src/jit-test/tests/profiler/wasm-to-js-2.js
@@ -0,0 +1,19 @@
+// |jit-test| skip-if: !wasmIsSupported()
+// Ensure readGeckoProfilingStack finds at least 1 Wasm frame on the stack.
+function calledFromWasm() {
+    let frames = readGeckoProfilingStack().flat();
+    assertEq(frames.filter(f => f.kind === "wasm").length >= 1, true);
+}
+enableGeckoProfiling();
+const text = `(module
+    (import "m" "f" (func $f))
+    (func (export "test")
+    (call $f)
+))`;
+const bytes = wasmTextToBinary(text);
+const mod = new WebAssembly.Module(bytes);
+const imports = {"m": {"f": calledFromWasm}};
+const instance = new WebAssembly.Instance(mod, imports);
+for (let i = 0; i < 150; i++) {
+    instance.exports.test();
+}