Skip to content

Commit

Permalink
deps: cherry-pick f4a2b7f3 from V8 upstream.
Browse files Browse the repository at this point in the history
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:
    nodejs/node#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 <dgozman@chromium.org>
    Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#48265}

Fixes nodejs/node#15464

PR-URL: nodejs/node#16053
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
erinishimoticha authored and addaleax committed Oct 11, 2017
1 parent 4c467de commit ffe6234
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions deps/v8/src/inspector/v8-inspector-impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,22 @@ std::unique_ptr<V8StackTrace> 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);
}

Expand Down

0 comments on commit ffe6234

Please sign in to comment.