deps: cherry-pick 09de996 from V8 upstream#11905
Closed
fhinkel wants to merge 1 commit intonodejs:masterfrom
Closed
deps: cherry-pick 09de996 from V8 upstream#11905fhinkel wants to merge 1 commit intonodejs:masterfrom
fhinkel wants to merge 1 commit intonodejs:masterfrom
Conversation
nodejs-github-bot
added
the
v8 engine
bnoordhuis
approved these changes
Mar 17, 2017
Contributor
Member
|
I merged this upstream to 5.7 already. There is also another fix that I merged with it, which fixes a similar problem. |
Member
Author
|
The bug doesn't occur in Node v6. It does occur in Node v7 (V8 5.4). If the patch applies cleanly we should backport to v7. |
ofrobots
approved these changes
Mar 17, 2017
Contributor
ofrobots
left a comment
ofrobots
left a comment
There was a problem hiding this comment.
LGTM once you include a bump to V8 version.
Original commit message: [debugger] fix switch block source positions. The switch statement itself is part of the switch block. However, the source position of the statement is outside of the block. This leads to confusion for the debugger, if the switch block pushes a block context: the current context is a block context, but the scope analysis based on the current source position tells the debugger that we should be outside the scope, so we should have the function context. R=marja@chromium.org BUG=v8:6085 Review-Url: https://codereview.chromium.org/2744213003 Cr-Commit-Position: refs/heads/master@{nodejs#43744} Committed: https://chromium.googlesource.com/v8/v8/+/09de9969ccb9bc3bbd667788afad665b309d02f5 Fixes: nodejs#11746
Member
Author
|
Good catch, thanks! Bumped the version. |
Member
Author
Member
Author
|
Landed in dd8982d |
fhinkel
added a commit
that referenced
this pull request
Mar 19, 2017
Original commit message: [debugger] fix switch block source positions. The switch statement itself is part of the switch block. However, the source position of the statement is outside of the block. This leads to confusion for the debugger, if the switch block pushes a block context: the current context is a block context, but the scope analysis based on the current source position tells the debugger that we should be outside the scope, so we should have the function context. R=marja@chromium.org BUG=v8:6085 Review-Url: https://codereview.chromium.org/2744213003 Cr-Commit-Position: refs/heads/master@{#43744} Committed: https://chromium.googlesource.com/v8/v8/+/09de9969ccb9bc3bbd667788afad665b309d02f5 Fixes: #11746 PR-URL: #11905 Fixes: #11746 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
jungx098
pushed a commit
to jungx098/node
that referenced
this pull request
Mar 21, 2017
Original commit message: [debugger] fix switch block source positions. The switch statement itself is part of the switch block. However, the source position of the statement is outside of the block. This leads to confusion for the debugger, if the switch block pushes a block context: the current context is a block context, but the scope analysis based on the current source position tells the debugger that we should be outside the scope, so we should have the function context. R=marja@chromium.org BUG=v8:6085 Review-Url: https://codereview.chromium.org/2744213003 Cr-Commit-Position: refs/heads/master@{nodejs#43744} Committed: https://chromium.googlesource.com/v8/v8/+/09de9969ccb9bc3bbd667788afad665b309d02f5 Fixes: nodejs#11746 PR-URL: nodejs#11905 Fixes: nodejs#11746 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
|
This is not landing clearly in v7, git conflicts. @fhinkel be aware, the V8 version in Node 7 is |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Original commit message:
Fixes: #11746
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
deps, v8
/cc @nodejs/v8
The test in #11746
does not crash with this fix anymore. But since it's a V8 fix, I think we don't need an extra regression test here.