From e6398fa3d464667ae04f411d056dc49104081d5f Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Sun, 12 May 2019 13:18:17 -1000
Subject: [PATCH] Bug 1547084 Part 5 - Debugger changes for new control logic,
 r=loganfsmyth.

--HG--
extra : rebase_source : 800196b6c73dec30db3afa0b3a5d87acbfd76e5e
---
 devtools/server/actors/thread.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/devtools/server/actors/thread.js b/devtools/server/actors/thread.js
index f0f468fc65ee..e3664881780e 100644
--- a/devtools/server/actors/thread.js
+++ b/devtools/server/actors/thread.js
@@ -859,7 +859,11 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
               olderFrame = olderFrame.older;
             }
             if (olderFrame) {
-              olderFrame.setReplayingOnStep(onStep, [olderFrame.offset]);
+              // Set an onStep handler in the older frame to stop at the call site.
+              // Make sure the offsets we use are valid breakpoint locations, as we
+              // cannot stop at other offsets when replaying.
+              const offsets = this._findReplayingStepOffsets({}, olderFrame, true);
+              olderFrame.setReplayingOnStep(onStep, offsets);
             }
           } else {
             stepFrame.onPop = onPop;