| Index: src/debug/debug.cc | 
| diff --git a/src/debug/debug.cc b/src/debug/debug.cc | 
| index acd911a137fa3d7d6a106feefe2f0f456e69bfee..2eb5bcae55a25ed8c9580c14ec9e41907c8e8317 100644 | 
| --- a/src/debug/debug.cc | 
| +++ b/src/debug/debug.cc | 
| @@ -956,6 +956,14 @@ void Debug::PrepareStepOnThrow() { | 
| it.Advance(); | 
| } | 
|  | 
| +  if (last_step_action() == StepNext) { | 
| +    while (!it.done()) { | 
| +      Address current_fp = it.frame()->UnpaddedFP(); | 
| +      if (current_fp >= thread_local_.target_fp_) break; | 
| +      it.Advance(); | 
| +    } | 
| +  } | 
| + | 
| // Find the closest Javascript frame we can flood with one-shots. | 
| while (!it.done() && | 
| !it.frame()->function()->shared()->IsSubjectToDebugging()) { | 
|  |