Skip to content

deps: backport a8f6869 from upstream V8 #22122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
benjamn wants to merge 4 commits into from
Closed

deps: backport a8f6869 from upstream V8 #22122

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a28a51d
deps: backport a8f6869 from upstream V8
Aug 4, 2018
3a2d175
Fix build errors by matching older V8 APIs used by Node.
Aug 8, 2018
023cea7
Skip restoring debug state unless thread previously in DebugScope.
Aug 14, 2018
8d66ed7
Bump v8_embedder_string to '-node.17'.
Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Skip restoring debug state unless thread previously in DebugScope. 
A simpler version of the changes I proposed upstream in this V8 change
request: https://chromium-review.googlesource.com/c/v8/v8/+/1168449

In this version, Debug::RestoreDebug never attempts to enter a new
DebugScope, but merely reuses the previous one, if we're returning to a
thread that was previously in a DebugScope. If the thread was not
previously in a DebugScope, I believe it does not need to have any
debugging state restored with ClearOneShot and PrepareStep.

The tests from https://chromium-review.googlesource.com/c/v8/v8/+/833260
still pass, and the failing V8-CI tests are now passing locally for me:
https://ci.nodejs.org/job/node-test-commit-v8-linux/1601/
  • Loading branch information
@targos
Ben Newman authored and targos committed Sep 3, 2018
commit 023cea7352c23c618445d08f662f398a5ec44f9c
23 changes: 14 additions & 9 deletions deps/v8/src/debug/debug.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,16 +364,21 @@ char* Debug::RestoreDebug(char* storage) {
MemCopy(reinterpret_cast<char*>(&thread_local_), storage,
ArchiveSpacePerThread());

// Enter the debugger.
DebugScope debug_scope(this);

// Clear any one-shot breakpoints that may have been set by the other
// thread, and reapply breakpoints for this thread.
ClearOneShot();
if (in_debug_scope()) {
// If this thread was in a DebugScope when we archived it, restore the
// previous debugging state now. Note that in_debug_scope() returns
// true when thread_local_.current_debug_scope_ (restored by MemCopy
// above) is non-null.

// Clear any one-shot breakpoints that may have been set by the other
// thread, and reapply breakpoints for this thread.
HandleScope scope(isolate_);
ClearOneShot();

if (thread_local_.last_step_action_ != StepNone) {
// Reset the previous step action for this thread.
PrepareStep(thread_local_.last_step_action_);
if (thread_local_.last_step_action_ != StepNone) {
// Reset the previous step action for this thread.
PrepareStep(thread_local_.last_step_action_);
}
}

return storage + ArchiveSpacePerThread();
Expand Down