diff -r 000000000000 -r 6474c204b198 js/src/jit-test/tests/debug/Frame-onStep-05.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit-test/tests/debug/Frame-onStep-05.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,14 @@
+// Upon returning to a frame with an onStep hook, the hook is called before the
+// next line.
+
+var g = newGlobal();
+g.log = '';
+g.eval("function f() { debugger; }");
+
+var dbg = Debugger(g);
+dbg.onDebuggerStatement = function (frame) {
+    frame.older.onStep = function () { g.log += 's'; };
+};
+g.eval("f();\n" +
+       "log += 'x';\n");
+assertEq(g.log.charAt(0), 's');