diff options
| author | Anna Henningsen <anna@addaleax.net> | 2019-03-15 23:00:27 +0100 |
|---|---|---|
| committer | Refael Ackermann <refack@gmail.com> | 2019-03-28 16:38:06 -0400 |
| commit | 1f03fb4d492ea6ba1e6f7f50f68257d7c49817b8 (patch) | |
| tree | 59a1f7db13a176d6bc7aeaf36f5dcd890f080f78 /deps | |
| parent | e6af2207a9d5a7602688379147662a2bb4ee4ce6 (diff) | |
| download | android-node-v8-1f03fb4d492ea6ba1e6f7f50f68257d7c49817b8.tar.gz android-node-v8-1f03fb4d492ea6ba1e6f7f50f68257d7c49817b8.tar.bz2 android-node-v8-1f03fb4d492ea6ba1e6f7f50f68257d7c49817b8.zip | |
deps: V8: cherry-pick e5f01ba
Original commit message:
[cleanup] Remove unused stack_trace_ member from PromiseRejectMessage
R=yangguo@chromium.org
Bug: v8:8742
Change-Id: I307097021893617ed5178f1e967f9360a55cd929
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1520710
Auto-Submit: Simon Zünd <szuend@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#60221}
Refs: https://github.com/v8/v8/commit/e5f01ba13fd199c76fcfb755346b97c6b97fc6d9
PR-URL: https://github.com/nodejs/node/pull/26685
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/include/v8.h | 8 | ||||
| -rw-r--r-- | deps/v8/src/isolate.cc | 7 |
2 files changed, 3 insertions, 12 deletions
diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index ac96091ef6..0a19d1aef3 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -6717,11 +6717,8 @@ enum PromiseRejectEvent { class PromiseRejectMessage { public: PromiseRejectMessage(Local<Promise> promise, PromiseRejectEvent event, - Local<Value> value, Local<StackTrace> stack_trace) - : promise_(promise), - event_(event), - value_(value), - stack_trace_(stack_trace) {} + Local<Value> value) + : promise_(promise), event_(event), value_(value) {} V8_INLINE Local<Promise> GetPromise() const { return promise_; } V8_INLINE PromiseRejectEvent GetEvent() const { return event_; } @@ -6731,7 +6728,6 @@ class PromiseRejectMessage { Local<Promise> promise_; PromiseRejectEvent event_; Local<Value> value_; - Local<StackTrace> stack_trace_; }; typedef void (*PromiseRejectCallback)(PromiseRejectMessage message); diff --git a/deps/v8/src/isolate.cc b/deps/v8/src/isolate.cc index 73aee01a6d..8187284ba8 100644 --- a/deps/v8/src/isolate.cc +++ b/deps/v8/src/isolate.cc @@ -4400,13 +4400,8 @@ void Isolate::ReportPromiseReject(Handle<JSPromise> promise, Handle<Object> value, v8::PromiseRejectEvent event) { if (promise_reject_callback_ == nullptr) return; - Handle<FixedArray> stack_trace; - if (event != v8::kPromiseHandlerAddedAfterReject && value->IsJSObject()) { - stack_trace = GetDetailedStackTrace(Handle<JSObject>::cast(value)); - } promise_reject_callback_(v8::PromiseRejectMessage( - v8::Utils::PromiseToLocal(promise), event, v8::Utils::ToLocal(value), - v8::Utils::StackTraceToLocal(stack_trace))); + v8::Utils::PromiseToLocal(promise), event, v8::Utils::ToLocal(value))); } void Isolate::SetUseCounterCallback(v8::Isolate::UseCounterCallback callback) { |