From ffe623474221c93b7638b9432e4a5bb54ea325ee Mon Sep 17 00:00:00 2001 From: Erin Spiceland Date: Mon, 2 Oct 2017 15:49:52 -0700 Subject: [PATCH] deps: cherry-pick f4a2b7f3 from V8 upstream. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: should ignore asyncTask* with null In V8Debugger code we don't expect task_id == null, e.g. asyncTaskStartedForStepping will trigger debug break on null as task_id. Let's filter task_id == null out. This issue is originally filed in Node.js: https://github.com/nodejs/node/issues/15464 R=dgozman@chromium.org Bug: none Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel Change-Id: Icc9f96105b3c91ee1b102d545a7817f7ee93394c Reviewed-on: https://chromium-review.googlesource.com/695808 Reviewed-by: Dmitry Gozman Commit-Queue: Aleksey Kozyatinskiy Cr-Commit-Position: refs/heads/master@{#48265} Fixes https://github.com/nodejs/node/issues/15464 PR-URL: https://github.com/nodejs/node/pull/16053 Reviewed-By: Myles Borins Reviewed-By: Anna Henningsen Reviewed-By: Gibson Fahnestock Reviewed-By: Ali Ijaz Sheikh Reviewed-By: Michaƫl Zasso Reviewed-By: Colin Ihrig --- deps/v8/src/inspector/v8-inspector-impl.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deps/v8/src/inspector/v8-inspector-impl.cc b/deps/v8/src/inspector/v8-inspector-impl.cc index 0a7b19a36a..4cdbba9c91 100644 --- a/deps/v8/src/inspector/v8-inspector-impl.cc +++ b/deps/v8/src/inspector/v8-inspector-impl.cc @@ -286,18 +286,22 @@ std::unique_ptr V8InspectorImpl::captureStackTrace( void V8InspectorImpl::asyncTaskScheduled(const StringView& taskName, void* task, bool recurring) { + if (!task) return; m_debugger->asyncTaskScheduled(taskName, task, recurring); } void V8InspectorImpl::asyncTaskCanceled(void* task) { + if (!task) return; m_debugger->asyncTaskCanceled(task); } void V8InspectorImpl::asyncTaskStarted(void* task) { + if (!task) return; m_debugger->asyncTaskStarted(task); } void V8InspectorImpl::asyncTaskFinished(void* task) { + if (!task) return; m_debugger->asyncTaskFinished(task); }