Skip to content

[v10.x] deps,v8: cherry pick 6e101b044eb49b45280d043624d911567ccca163#24555

Closed
refack wants to merge 1 commit intonodejs:v10.x-stagingfrom
refack:v8-29879461
Closed

[v10.x] deps,v8: cherry pick 6e101b044eb49b45280d043624d911567ccca163#24555
refack wants to merge 1 commit intonodejs:v10.x-stagingfrom
refack:v8-29879461

Conversation

@refack
Copy link
Contributor

@refack refack commented Nov 21, 2018 •
edited
Loading

Fixes: #20891 (comment)

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Nov 21, 2018

@refack build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/1666/pipeline

@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. v10.x v8 engine Issues and PRs related to the V8 dependency. labels Nov 21, 2018
@refack
Copy link
Contributor Author

refack commented Nov 21, 2018

@nodejs/lts for your consideration

@refack refack mentioned this pull request Nov 21, 2018
Closed
@targos
Copy link
Member

targos commented Nov 21, 2018 •
edited
Loading

Could you please try to redo the commits of this PR with git node v8 backport?

@refack
Copy link
Contributor Author

refack commented Nov 21, 2018

Could you please try to redo the commits of this PR with git node v8 backport?

Fancy 😎
(But there's room for improvement, IIUC we don't need a whole git clone in $HOME\.update-v8\ when we can do curl https://github.com/v8/v8/commit/2987946.patch | cd deps/v8 && git am -3)

BTW: I might replace #24450 with something like that...

@targos
Copy link
Member

targos commented Nov 21, 2018

(But there's room for improvement, IIUC we don't need a whole git clone in $HOME\.update-v8\ when we can do curl https://github.com/v8/v8/commit/2987946.patch | cd deps/v8 && git am -3)

Indeed, downloading the patch from GH would be a huge improvement for those who never need to run the other update commands.

@addaleax addaleax changed the title deps,v8: cherry pick 6e101b044eb49b45280d043624d911567ccca163 [v10.x] deps,v8: cherry pick 6e101b044eb49b45280d043624d911567ccca163 Nov 21, 2018
@richardlau
Copy link
Member

richardlau commented Nov 21, 2018

deps/v8/1.patch and deps/v8/gypfiles/inspector.gyp are unrelated?

@targos
Copy link
Member

targos commented Nov 21, 2018

This makes me think of another thing that the command could do: check if the branch is clean at the start

@refack
Copy link
Contributor Author

refack commented Nov 21, 2018 •
edited
Loading

This makes me think of another thing that the command could do: check if the branch is clean at the start

git node v8 auto added them. They were there, but not git added. (See me first force-push)
Anyway, they are out now.

@refack
deps: cherry-pick 2987946 from upstream V8
aa98452 
Original commit message:

    Stop manual unescaping of script source data when preprocessing logs.

    It appears that the fields are already being unescaped elsewhere,
    perhaps by the JSON writer. So if we unescape when adding the source
    filename and contents, unescaping will happen again later and plain
    backslashes will be interpreted as escape codes.

    Bug: v8:6240
    Change-Id: Ic66b9017ae685d6dd12944ee8d254991e26fbd32
    Reviewed-on: https://chromium-review.googlesource.com/1186625
    Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
    Commit-Queue: Bret Sepulveda <bsep@chromium.org>
    Cr-Commit-Position: refs/heads/master@{nodejs#55401}

Refs: v8/v8@2987946
@refack
Copy link
Contributor Author

refack commented Nov 23, 2018 •
edited
Loading

V8 CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/1896/ ✔️

@refack refack added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Nov 23, 2018
@MylesBorins
Copy link
Contributor

MylesBorins commented Nov 26, 2018

CI: https://ci.nodejs.org/job/node-test-pull-request/18967/

@MylesBorins MylesBorins reopened this Nov 26, 2018
@MylesBorins
Copy link
Contributor

MylesBorins commented Nov 27, 2018

landed in e66c09e

MylesBorins pushed a commit that referenced this pull request Nov 27, 2018
@refack @MylesBorins
deps: cherry-pick 2987946 from upstream V8
e66c09e 
Original commit message:

    Stop manual unescaping of script source data when preprocessing logs.

    It appears that the fields are already being unescaped elsewhere,
    perhaps by the JSON writer. So if we unescape when adding the source
    filename and contents, unescaping will happen again later and plain
    backslashes will be interpreted as escape codes.

    Bug: v8:6240
    Change-Id: Ic66b9017ae685d6dd12944ee8d254991e26fbd32
    Reviewed-on: https://chromium-review.googlesource.com/1186625
    Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
    Commit-Queue: Bret Sepulveda <bsep@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#55401}

Refs: v8/v8@2987946

PR-URL: #24555
Fixes: #20891
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
@codebytere codebytere mentioned this pull request Nov 27, 2018
Closed
@refack refack deleted the v8-29879461 branch November 27, 2018 16:50
rvagg pushed a commit that referenced this pull request Nov 28, 2018
@refack @rvagg
deps: cherry-pick 2987946 from upstream V8
391f8bf 
Original commit message:

    Stop manual unescaping of script source data when preprocessing logs.

    It appears that the fields are already being unescaped elsewhere,
    perhaps by the JSON writer. So if we unescape when adding the source
    filename and contents, unescaping will happen again later and plain
    backslashes will be interpreted as escape codes.

    Bug: v8:6240
    Change-Id: Ic66b9017ae685d6dd12944ee8d254991e26fbd32
    Reviewed-on: https://chromium-review.googlesource.com/1186625
    Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
    Commit-Queue: Bret Sepulveda <bsep@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#55401}

Refs: v8/v8@2987946

PR-URL: #24555
Fixes: #20891
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
MylesBorins pushed a commit that referenced this pull request Nov 29, 2018
@refack @MylesBorins
deps: cherry-pick 2987946 from upstream V8
24a5c56 
Original commit message:

    Stop manual unescaping of script source data when preprocessing logs.

    It appears that the fields are already being unescaped elsewhere,
    perhaps by the JSON writer. So if we unescape when adding the source
    filename and contents, unescaping will happen again later and plain
    backslashes will be interpreted as escape codes.

    Bug: v8:6240
    Change-Id: Ic66b9017ae685d6dd12944ee8d254991e26fbd32
    Reviewed-on: https://chromium-review.googlesource.com/1186625
    Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
    Commit-Queue: Bret Sepulveda <bsep@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#55401}

Refs: v8/v8@2987946

PR-URL: #24555
Fixes: #20891
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
@codebytere codebytere mentioned this pull request Nov 29, 2018
Merged
MylesBorins pushed a commit that referenced this pull request Dec 3, 2018
@refack @MylesBorins
deps: cherry-pick 2987946 from upstream V8
983e3a1 
Original commit message:

    Stop manual unescaping of script source data when preprocessing logs.

    It appears that the fields are already being unescaped elsewhere,
    perhaps by the JSON writer. So if we unescape when adding the source
    filename and contents, unescaping will happen again later and plain
    backslashes will be interpreted as escape codes.

    Bug: v8:6240
    Change-Id: Ic66b9017ae685d6dd12944ee8d254991e26fbd32
    Reviewed-on: https://chromium-review.googlesource.com/1186625
    Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
    Commit-Queue: Bret Sepulveda <bsep@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#55401}

Refs: v8/v8@2987946

PR-URL: #24555
Fixes: #20891
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlau richardlau richardlau approved these changes

@targos targos Awaiting requested review from targos

@psmarshall psmarshall Awaiting requested review from psmarshall

+1 more reviewer

@bzoz bzoz bzoz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

author ready PRs that have at least one approval, no pending requests for changes, and a CI started. build Issues and PRs related to build files or the CI. v8 engine Issues and PRs related to the V8 dependency.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@refack @nodejs-github-bot @targos @richardlau @MylesBorins @bzoz