Commit aa6b9f9
committed
deps: cherry-pick baba152 from V8 upstream
Original commit message:
fix stepping out of across throwing.
R=jgruber@chromium.org
BUG=v8:5559
Review-Url: https://codereview.chromium.org/2445233004
Cr-Commit-Position: refs/heads/master@{#40549}
PR-URL: #10688
Fixes: #9175
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>1 parent 61f6f12 commit aa6b9f9
3 files changed
Lines changed: 40 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,7 @@ | |||
| 11 | 11 | #define V8_MAJOR_VERSION 5 | |
| 12 | 12 | #define V8_MINOR_VERSION 4 | |
| 13 | 13 | #define V8_BUILD_NUMBER 500 | |
| 14 | - #define V8_PATCH_LEVEL 46 | ||
| 14 | + #define V8_PATCH_LEVEL 47 | ||
| 15 | 15 | ||
| 16 | 16 | // Use 1 for candidates and 0 otherwise. | |
| 17 | 17 | // (Boolean macro values are not supported by all preprocessors.) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -935,7 +935,7 @@ void Debug::PrepareStepOnThrow() { | |||
| 935 | 935 | it.Advance(); | |
| 936 | 936 | } | |
| 937 | 937 | ||
| 938 | - if (last_step_action() == StepNext) { | ||
| 938 | + if (last_step_action() == StepNext || last_step_action() == StepOut) { | ||
| 939 | 939 | while (!it.done()) { | |
| 940 | 940 | Address current_fp = it.frame()->UnpaddedFP(); | |
| 941 | 941 | if (current_fp >= thread_local_.target_fp_) break; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,38 @@ | |||
| 1 | + // Copyright 2016 the V8 project authors. All rights reserved. | ||
| 2 | + // Use of this source code is governed by a BSD-style license that can be | ||
| 3 | + // found in the LICENSE file. | ||
| 4 | + | ||
| 5 | + // Flags: --expose-debug-as debug | ||
| 6 | + | ||
| 7 | + Debug = debug.Debug | ||
| 8 | + | ||
| 9 | + var exception = null; | ||
| 10 | + var break_count = 0; | ||
| 11 | + | ||
| 12 | + function listener(event, exec_state, event_data, data) { | ||
| 13 | + if (event != Debug.DebugEvent.Break) return; | ||
| 14 | + try { | ||
| 15 | + print(event_data.sourceLineText()); | ||
| 16 | + assertTrue( | ||
| 17 | + event_data.sourceLineText().indexOf(`Break ${break_count++}.`) > 0); | ||
| 18 | + exec_state.prepareStep(Debug.StepAction.StepOut); | ||
| 19 | + } catch (e) { | ||
| 20 | + exception = e; | ||
| 21 | + } | ||
| 22 | + }; | ||
| 23 | + | ||
| 24 | + function thrower() { | ||
| 25 | + try { | ||
| 26 | + debugger; // Break 0. | ||
| 27 | + throw 'error'; | ||
| 28 | + } catch (err) { | ||
| 29 | + } | ||
| 30 | + } | ||
| 31 | + | ||
| 32 | + | ||
| 33 | + Debug.setListener(listener); | ||
| 34 | + thrower(); | ||
| 35 | + Debug.setListener(null); // Break 1. | ||
| 36 | + | ||
| 37 | + assertNull(exception); | ||
| 38 | + assertEquals(2, break_count); | ||
0 commit comments