1 files changed, 93 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/debug/resumption-08.js b/js/src/jit-test/tests/debug/resumption-08.js
new file mode 100644
index 0000000000..044029584e
--- /dev/null
+++ b/js/src/jit-test/tests/debug/resumption-08.js
@@ -0,0 +1,93 @@
+// Check whether we respect resumption values when toggling debug mode on->off
+// from various points with live scripts on the stack.
+
+var g = newGlobal({newCompartment: true});
+var dbg = new Debugger;
+
+function reset() {
+  dbg.onEnterFrame = undefined;
+  dbg.onDebuggerStatement = undefined;
+  dbg.addDebuggee(g);
+  g.eval("(" + function test() {
+    for (i = 0; i < 5; i++)
+      f(42);
+  } + ")();");
+}
+
+g.eval("" + function f(d) {
+  return g(d);
+});
+
+g.eval("" + function g(d) {
+  debugger;
+  return d;
+});
+
+function testResumptionValues(handlerSetter) {
+  // Test normal return.
+  reset();
+  handlerSetter(undefined);
+  assertEq(g.eval("(" + function test() { return f(42); } + ")();"), 42);
+
+  // Test forced return.
+  reset();
+  handlerSetter({ return: "not 42" });
+  assertEq(g.eval("(" + function test() { return f(42); } + ")();"), "not 42");
+
+  // Test throw.
+  reset();
+  handlerSetter({ throw: "thrown 42" });
+  try {
+    g.eval("(" + function test() { return f(42); } + ")();");;
+  } catch (e) {
+    assertEq(e, "thrown 42");
+  }
+}
+
+// Turn off from within the prologue.
+testResumptionValues(function (resumptionVal) {
+  dbg.onEnterFrame = function (frame) {
+    if (frame.older) {
+      if (frame.older.older) {
+        dbg.removeDebuggee(g);
+        return resumptionVal;
+      }
+    }
+  };
+});
+
+// Turn off from within the epilogue.
+testResumptionValues(function (resumptionVal) {
+  dbg.onEnterFrame = function (frame) {
+    if (frame.older) {
+      if (frame.older.older) {
+        frame.onPop = function () {
+          dbg.removeDebuggee(g);
+          return resumptionVal;
+        };
+      }
+    }
+  };
+});
+
+// Turn off from within debugger statement handler.
+testResumptionValues(function (resumptionVal) {
+  dbg.onDebuggerStatement = function (frame) {
+    dbg.removeDebuggee(g);
+    return resumptionVal;
+  };
+});
+
+// Turn off from within debug trap handler.
+testResumptionValues(function (resumptionVal) {
+  dbg.onEnterFrame = function (frame) {
+    if (frame.older) {
+      if (frame.older.older) {
+        frame.onStep = function () {
+          dbg.removeDebuggee(g);
+          return resumptionVal;
+        }
+      }
+    }
+  };
+});