1 files changed, 45 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/debug/Frame-onPop-return.js b/js/src/jit-test/tests/debug/Frame-onPop-return.js
new file mode 100644
index 0000000000..e1288d8d3a
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-onPop-return.js
@@ -0,0 +1,45 @@
+// |jit-test| error: TestComplete
+// onPop fires when frames return normally.
+
+var g = newGlobal({newCompartment: true});
+var dbg = new Debugger(g);
+
+function test(type, provocation) {
+    var log;
+    var wasConstructing;
+
+    // Help people figure out which 'test' call failed.
+    print("type:        " + JSON.stringify(type));
+    print("provocation: " + JSON.stringify(provocation));
+
+    dbg.onDebuggerStatement = function handleDebuggerStatement(f) {
+        log += 'd';
+    };
+
+    dbg.onEnterFrame = function handleEnterFrame(f) {
+        log += '(';
+        assertEq(f.type, type);
+        wasConstructing = f.constructing;
+        f.onPop = function handlePop(c) {
+            log += ')';
+            assertEq(c.return, 'compliment');
+        };
+    };
+
+    log = '';
+    var result = provocation();
+    if (wasConstructing)
+        assertEq(typeof result, "object");
+    else
+        assertEq(result, 'compliment');
+    assertEq(log, "(d)");
+
+    print();
+}
+
+g.eval("function f() { debugger; return 'compliment'; }");
+test("call", g.f);
+test("call", function () { return new g.f; });
+test("eval", function () { return g.eval("debugger; \'compliment\';"); });
+test("global", function () { return g.evaluate("debugger; \'compliment\';"); });
+throw 'TestComplete';