Skip to content

Commit

Permalink
deps: cherry-pick baba152 from V8 upstream
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
targos committed Jan 17, 2017
1 parent 61f6f12 commit aa6b9f9
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 2 deletions.
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 5
#define V8_MINOR_VERSION 4
#define V8_BUILD_NUMBER 500
#define V8_PATCH_LEVEL 46
#define V8_PATCH_LEVEL 47

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/debug/debug.cc
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,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;
Expand Down
38 changes: 38 additions & 0 deletions deps/v8/test/mjsunit/regress/regress-5559.js
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit aa6b9f9

Please sign in to comment.