1 files changed, 31 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/debug/Frame-onStep-resumption-04.js b/js/src/jit-test/tests/debug/Frame-onStep-resumption-04.js
new file mode 100644
index 0000000000..d557152a14
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-onStep-resumption-04.js
@@ -0,0 +1,31 @@
+// If frame.onStep returns null, debuggee catch and finally blocks are skipped.
+
+var g = newGlobal({newCompartment: true});
+g.eval("function h() { debugger; }");
+
+var dbg = Debugger(g);
+var hits = 0;
+dbg.onDebuggerStatement = function (frame) {
+    hits++;
+    if (hits == 1) {
+        var rv = frame.eval("try {\n" +
+                            "    h();\n" +
+                            "    throw 'fail';\n" +
+                            "} catch (exc) {\n" +
+                            "    caught = exc;\n" +
+                            "} finally {\n" +
+                            "    finallyHit = true;\n" +
+                            "}\n");
+        assertEq(rv, null);
+    } else {
+        frame.older.onStep = function () {
+            this.onStep = undefined;
+            return null;
+        };
+    }
+};
+
+g.h();
+assertEq(hits, 2);
+assertEq("caught" in g, false);
+assertEq("finallyHit" in g, false);