AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[debugger] fix stepping out of across throwing.

Browse Source 
R=jgruber@chromium.org
BUG=v8:5559

Review-Url: https://codereview.chromium.org/2445233004
Cr-Commit-Position: refs/heads/master@{#40549}
This commit is contained in:
yangguo 2016-10-25 01:00:13 -07:00 committed by Commit bot
parent 26a5f2128b
commit baba15223c
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debug/debug.cc
View File

@ -936,7 +936,7 @@ void Debug::PrepareStepOnThrow() {
it.Advance();
}
if (last_step_action() == StepNext) {
if (last_step_action() == StepNext || last_step_action() == StepOut) {
while (!it.done()) {
Address current_fp = it.frame()->UnpaddedFP();
if (current_fp >= thread_local_.target_fp_) break;

38
test/mjsunit/regress/regress-5559.js Normal file
View File

@ -0,0 +1,38 @@
// Copyright 2016 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Flags: --expose-debug-as debug
Debug = debug.Debug
var exception = null;
var break_count = 0;
function listener(event, exec_state, event_data, data) {
if (event != Debug.DebugEvent.Break) return;
try {
print(event_data.sourceLineText());
assertTrue(
event_data.sourceLineText().indexOf(`Break ${break_count++}.`) > 0);
exec_state.prepareStep(Debug.StepAction.StepOut);
} catch (e) {
exception = e;
}
};
function thrower() {
try {
debugger; // Break 0.
throw 'error';
} catch (err) {
}
}
Debug.setListener(listener);
thrower();
Debug.setListener(null); // Break 1.
assertNull(exception);
assertEquals(2, break_count);