1 files changed, 59 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/debug/Frame-onPop-throw-error.js b/js/src/jit-test/tests/debug/Frame-onPop-throw-error.js
new file mode 100644
index 0000000000..83dee69686
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-onPop-throw-error.js
@@ -0,0 +1,59 @@
+// |jit-test| error: TestComplete
+// onPop can change a throw into a termination.
+
+var g = newGlobal({newCompartment: true});
+var dbg = new Debugger(g);
+
+// We use Debugger.Frame.prototype.eval and ignore the outer 'eval' frame so we 
+// can catch the termination.
+
+function test(type, provocation) {
+    // Help people figure out which 'test' call failed.
+    print("type:        " + JSON.stringify(type));
+    print("provocation: " + JSON.stringify(provocation));
+
+    var log;
+    dbg.onEnterFrame = function handleFirstFrame(f) {
+        log += 'f';
+        dbg.onDebuggerStatement = function handleDebugger(f) {
+            log += 'd';
+        };
+
+        dbg.onEnterFrame = function handleSecondFrame(f) {
+            log += 'e';
+            assertEq(f.type, 'eval');
+
+            dbg.onEnterFrame = function handleThirdFrame(f) {
+                log += '(';
+                assertEq(f.type, type);
+
+                dbg.onEnterFrame = function handleExtraFrames(f) {
+                    // This should never be called.
+                    assertEq(false, true);
+                };
+
+                f.onPop = function handlePop(c) {
+                    log += ')';
+                    assertEq(c.throw, 'mud');
+                    return null;
+                };
+            };
+        };
+
+        assertEq(f.eval(provocation), null);
+    };
+
+    log = '';
+    // This causes handleFirstFrame to be called.
+    assertEq(typeof g.eval('eval'), 'function');
+    assertEq(log, 'fe(d)');
+
+    print();
+}
+
+g.eval('function f() { debugger; throw \'mud\'; }');
+test('call', 'f();');
+test('call', 'new f;');
+test('eval', 'eval(\'debugger; throw \\\'mud\\\';\');');
+test('global', 'evaluate(\'debugger; throw \\\'mud\\\';\');');
+throw 'TestComplete';