1 files changed, 35 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/debug/onEnterFrame-generator-resumption-03.js b/js/src/jit-test/tests/debug/onEnterFrame-generator-resumption-03.js
new file mode 100644
index 0000000000..b5461f2b8c
--- /dev/null
+++ b/js/src/jit-test/tests/debug/onEnterFrame-generator-resumption-03.js
@@ -0,0 +1,35 @@
+// Returning {throw:} from onEnterFrame when resuming inside a try block in a
+// generator causes control to jump to the catch block.
+
+let g = newGlobal({newCompartment: true});
+g.eval(`
+    function* gen() {
+        try {
+            yield 0;
+            return "fail";
+        } catch (exc) {
+            assertEq(exc, "fit");
+            return "ok";
+        }
+    }
+`)
+
+let dbg = new Debugger(g);
+let hits = 0;
+dbg.onEnterFrame = frame => {
+    assertEq(frame.callee.name, "gen");
+    if (++hits == 3) {
+        // First hit is when calling gen();
+        // second hit is resuming at the implicit initial yield;
+        // third hit is resuming inside the try block.
+        return {throw: "fit"};
+    }
+};
+
+let it = g.gen();
+let result = it.next();
+assertEq(result.done, false);
+assertEq(result.value, 0);
+result = it.next();
+assertEq(result.done, true);
+assertEq(result.value, "ok");