Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

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

1 files changed, 58 insertions, 0 deletions

diff --git a/js/src/jit-test/tests/debug/onExceptionUnwind-17.js b/js/src/jit-test/tests/debug/onExceptionUnwind-17.js
new file mode 100644
index 0000000000..5ced81758c
--- /dev/null
+++ b/js/src/jit-test/tests/debug/onExceptionUnwind-17.js
@@ -0,0 +1,58 @@
+// Test behavior of isInCatchScope on frame from loop iterator
+
+load(libdir + "asserts.js");
+
+var g = newGlobal({newCompartment: true});
+var dbg = Debugger(g);
+var hit = false;
+dbg.onExceptionUnwind = function (frame, exc) {
+    // onExceptionUnwind is called multiple times as the stack is unwound.
+    // Only check the first hit.
+    assertEq(frame instanceof Debugger.Frame, true);
+    assertEq(exc, 16);
+    if (!hit) {
+        hit = true;
+        {
+            assertEq(frame.type, "call");
+            assertEq(frame.callee.name, "foo");
+            assertEq(frame.older.type, "call");
+            const { lineNumber, columnNumber } = frame.script.getOffsetMetadata(frame.offset);
+            assertEq(lineNumber, 3);
+            assertEq(columnNumber, 4);
+
+            const isInCatchScope = frame.script.isInCatchScope(frame.offset);
+            assertEq(isInCatchScope, false);
+        }
+
+        {
+            const { older } = frame;
+            assertEq(older.type, "call");
+            assertEq(older.callee.name, "f");
+            assertEq(older.type, "call");
+            const { lineNumber, columnNumber } = older.script.getOffsetMetadata(older.offset);
+            assertEq(lineNumber, 8);
+            assertEq(columnNumber, 6);
+
+            const isInCatchScope = older.script.isInCatchScope(older.offset);
+            assertEq(isInCatchScope, true);
+        }
+    }
+};
+
+g.eval(
+`function f() {
+  function foo() {
+    throw 16; // <= first frame on exception is here
+  }
+
+  try {
+    for (const _ of [1]) {
+      foo(); // <= second frame, "older" is here
+    }
+  } catch (e) {
+    throw e;
+  }
+}
+`);
+assertThrowsValue(function () { g.eval("f();"); }, 16);
+assertEq(hit, true);