1 files changed, 36 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/debug/Frame-onStep-11.js b/js/src/jit-test/tests/debug/Frame-onStep-11.js
new file mode 100644
index 000000000..dae366165
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-onStep-11.js
@@ -0,0 +1,36 @@
+// Stepping out of a finally should not appear to
+// step backward to some earlier statement.
+
+var g = newGlobal();
+g.eval(`function f() {
+         debugger;              // +0
+         var x = 0;             // +1
+         try {                  // +2
+           x = 1;               // +3
+           throw 'something';   // +4
+         } catch (e) {          // +5
+           x = 2;               // +6
+         } finally {            // +7
+           x = 3;               // +8
+         }                      // +9
+         x = 4;                 // +10
+       }`);                     // +11
+
+var dbg = Debugger(g);
+
+let foundLines = '';
+
+dbg.onDebuggerStatement = function(frame) {
+  let debugLine = frame.script.getOffsetLocation(frame.offset).lineNumber;
+  frame.onStep = function() {
+    // Only record a stop when the offset is an entry point.
+    let foundLine = this.script.getOffsetLocation(this.offset).lineNumber;
+    if (foundLine != debugLine && this.script.getLineOffsets(foundLine).indexOf(this.offset) >= 0) {
+      foundLines += "," + (foundLine - debugLine);
+    }
+  };
+};
+
+g.f();
+
+assertEq(foundLines, ",1,2,3,4,5,6,7,8,10,11");