1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: cherry-pick 1420e44db0 from upstream V8

Browse Source 
Original commit message:

    [coverage] Correctly free DebugInfo in the absence of breakpoints

    It's quite possible for DebugInfos to exist without the presence of a
    bytecode array, since DebugInfos are created for all functions for which
    we have a CoverageInfo. Free such objects properly.

    Also move the corresponding deletion of CoverageInfos on unload up
    before the early exit.

    Bug: v8:6000
    Change-Id: Idde45b222290aa8b6828b61ff2251918b8ed2aed
    Reviewed-on: https://chromium-review.googlesource.com/664811
    Reviewed-by: Yang Guo <yangguo@chromium.org>
    Commit-Queue: Jakob Gruber <jgruber@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#48024}

Fixes crash when passing Profiler.startPreciseCoverage before
Debug.paused is received.

PR-URL: https://github.com/nodejs/node/pull/17344
Refs: 1420e44db0
Refs: https://github.com/bcoe/c8/pull/6#discussion_r153121287
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Timothy Gu 2017-11-26 23:33:17 -08:00
parent 4503da8a3a
commit b28af4dc26
No known key found for this signature in database
GPG Key ID: 7FE6B095B582B0D4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.gypi
View File

@ -27,7 +27,7 @@
# Reset this number to 0 on major V8 upgrades. # Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8. # Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.12', 'v8_embedder_string': '-node.13',
# Enable disassembler for `--print-code` v8 options # Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1, 'v8_enable_disassembler': 1,

8
deps/v8/src/debug/debug.cc vendored
View File

@ -338,13 +338,12 @@ bool Debug::Load() {
void Debug::Unload() { void Debug::Unload() {
ClearAllBreakPoints(); ClearAllBreakPoints();
ClearStepping(); ClearStepping();
if (FLAG_block_coverage) RemoveAllCoverageInfos();
RemoveDebugDelegate(); RemoveDebugDelegate();
// Return debugger is not loaded. // Return debugger is not loaded.
if (!is_loaded()) return; if (!is_loaded()) return;
if (FLAG_block_coverage) RemoveAllCoverageInfos();
// Clear debugger context global handle. // Clear debugger context global handle.
GlobalHandles::Destroy(Handle<Object>::cast(debug_context_).location()); GlobalHandles::Destroy(Handle<Object>::cast(debug_context_).location());
debug_context_ = Handle<Context>(); debug_context_ = Handle<Context>();
@ -643,8 +642,11 @@ void Debug::ApplyBreakPoints(Handle<DebugInfo> debug_info) {
} }
void Debug::ClearBreakPoints(Handle<DebugInfo> debug_info) { void Debug::ClearBreakPoints(Handle<DebugInfo> debug_info) {
// If we attempt to clear breakpoints but none exist, simply return. This can
// happen e.g. CoverageInfos exit but no breakpoints are set.
if (!debug_info->HasDebugBytecodeArray()) return;
DisallowHeapAllocation no_gc; DisallowHeapAllocation no_gc;
DCHECK(debug_info->HasDebugBytecodeArray());
for (BreakIterator it(debug_info); !it.Done(); it.Next()) { for (BreakIterator it(debug_info); !it.Done(); it.Next()) {
it.ClearDebugBreak(); it.ClearDebugBreak();
} }