From 228a0237b4a71dc0231908d40918482cb6c52eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Sun, 8 Jan 2017 21:11:24 +0100
Subject: [PATCH] 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}

Fixes: https://github.com/nodejs/node/issues/9175
---
 deps/v8/include/v8-version.h                 |  2 +-
 deps/v8/src/debug/debug.cc                   |  2 +-
 deps/v8/test/mjsunit/regress/regress-5559.js | 38 ++++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 deps/v8/test/mjsunit/regress/regress-5559.js

diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index 009a3b10425ee4..a39676e3779c60 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 4
 #define V8_BUILD_NUMBER 500
-#define V8_PATCH_LEVEL 45
+#define V8_PATCH_LEVEL 46
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/debug/debug.cc b/deps/v8/src/debug/debug.cc
index cce167f942934f..ad6cfa02887b02 100644
--- a/deps/v8/src/debug/debug.cc
+++ b/deps/v8/src/debug/debug.cc
@@ -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;
diff --git a/deps/v8/test/mjsunit/regress/regress-5559.js b/deps/v8/test/mjsunit/regress/regress-5559.js
new file mode 100644
index 00000000000000..c6f32575f55b9b
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-5559.js
@@ -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);