diff -r 000000000000 -r 6474c204b198 js/src/jit-test/tests/debug/Frame-onPop-error-throw.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit-test/tests/debug/Frame-onPop-error-throw.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,42 @@
+// |jit-test| error: TestComplete
+// onPop can change a termination into a throw.
+
+load(libdir + "asserts.js");
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+function test(type, provocation) {
+    var log;
+
+    // Help people figure out which 'test' call failed.
+    print("type:        " + uneval(type));
+    print("provocation: " + uneval(provocation));
+
+    dbg.onDebuggerStatement = function handleDebuggerStatement(f) {
+        log += 'd';
+        return null;
+    };
+
+    dbg.onEnterFrame = function handleEnterFrame(f) {
+        log += '(';
+        assertEq(f.type, type);
+        f.onPop = function handlePop(c) {
+            log += ')';
+            assertEq(c, null);
+            return { throw: 'snow' };
+        };
+    };
+
+    log = '';
+    assertThrowsValue(provocation, 'snow');
+    assertEq(log, "(d)");
+
+    print();
+}
+
+g.eval("function f() { debugger; return 'termination fail'; }");
+test("call", g.f);
+test("call", function () { return new g.f; });
+test("eval", function () { return g.eval("debugger; \'termination fail\';"); });
+test("global", function () { return g.evaluate("debugger; \'termination fail\';"); });
+throw 'TestComplete';