Skip to content
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

Jump to bottom

deps: backport 0353a1e from V8 upstream #15287

Closed
wants to merge 1 commit into from
Closed

deps: backport 0353a1e from V8 upstream #15287

wants to merge 1 commit into from

Conversation

jBarz
Copy link
Contributor

@jBarz jBarz commented Sep 8, 2017 •
edited
Loading

Original commit message:

Avoid disassembling Interpreted Regexp code

I found that v8 will crash when --print-code is turned on while Regexp
is interpreted. It crashes when trying to print Relocation info during
Disassembly. It should probably avoid printing out disassembly when the
Code object is a bytecode regexp.

Bug:
Change-Id: I35b531cb03996a303248652871452266c78fee38
Reviewed-on: https://chromium-review.googlesource.com/642127
Reviewed-by: Yang Guo yangguo@chromium.org

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

@jBarz
deps: backport 0353a1e from V8 upstream
15c6fa9 
Original commit message:

  Avoid disassembling Interpreted Regexp code

  I found that v8 will crash when --print-code is turned on while Regexp
  is interpreted. It crashes when trying to print Relocation info during
  Disassembly. It should probably avoid printing out disassembly when the
  Code object is a bytecode regexp.

  Bug:
  Change-Id: I35b531cb03996a303248652871452266c78fee38
  Reviewed-on: https://chromium-review.googlesource.com/642127
  Reviewed-by: Yang Guo <yangguo@chromium.org>
@nodejs-github-bot nodejs-github-bot added v6.x v8 engine Issues and PRs related to the V8 dependency. labels Sep 8, 2017
@BridgeAR
Copy link
Member

@jBarz was it meant to backport this to 6.x and not to open a PR against master?

@jBarz
Copy link
Contributor Author

jBarz commented Sep 13, 2017 •
edited
Loading

I meant to backport to v6.x only.

@BridgeAR
Copy link
Member

BridgeAR commented Sep 13, 2017 •
edited
Loading

@jBarz is this not relevant for 8.x and above or is it already included there?

@targos
Copy link
Member

targos commented Sep 13, 2017

It is not included in 8.x and above.

@jBarz
Copy link
Contributor Author

jBarz commented Sep 13, 2017 •
edited
Loading

Oh right, it is relevant for v8.x and above.
I can submit a v8.x backport PR.
Won't master eventually get this change though? Because it keeps up with the latest v8?

@BridgeAR
Copy link
Member

BridgeAR commented Sep 13, 2017 •
edited
Loading

@jBarz this will not land on 8.x without a explicit backport. And also master is not kept to the latest v8 version. Newer versions are included in semver-major versions. Master is limited to 6.1 right now because it refers to v.9.0.0-pre.

@targos
Copy link
Member

targos commented Sep 13, 2017 •
edited
Loading

We can do a merge request on V8 side for V8 6.2 and 6.1 (master has 6.1) and backport to v8.x

@fhinkel
Copy link
Member

fhinkel commented Sep 16, 2017

Did somebody open the merge request on the V8 side already?

@targos
Copy link
Member

targos commented Sep 16, 2017

I didn't

@jBarz
Copy link
Contributor Author

jBarz commented Sep 16, 2017

Sorry, will create the merge request on the V8 side today.

@targos
Copy link
Member

targos commented Sep 18, 2017

I opened https://bugs.chromium.org/p/v8/issues/detail?id=6835

MylesBorins pushed a commit that referenced this pull request Sep 19, 2017
@jBarz @MylesBorins
deps: backport 0353a1e from V8 upstream
4e1a50a 
Original commit message:

  Avoid disassembling Interpreted Regexp code

  I found that v8 will crash when --print-code is turned on while Regexp
  is interpreted. It crashes when trying to print Relocation info during
  Disassembly. It should probably avoid printing out disassembly when the
  Code object is a bytecode regexp.

  Bug:
  Change-Id: I35b531cb03996a303248652871452266c78fee38
  Reviewed-on: https://chromium-review.googlesource.com/642127
  Reviewed-by: Yang Guo <yangguo@chromium.org>

PR-URL: #15287
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@MylesBorins
Copy link
Contributor

quick V8 CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/915/

@addaleax do you want to float this on your 6.1 PR until it is updated upstream?

@addaleax
Copy link
Member

@MylesBorins sorry, which PR? If you’re talking about #15393 that’s @targos’s PR, and I don’t really know how to keep track of what needs to lands in which branch :)

@MylesBorins
Copy link
Contributor

landed in 4e1a50a

@MylesBorins MylesBorins mentioned this pull request Sep 20, 2017
Merged
@targos targos mentioned this pull request Sep 25, 2017
Merged
2 tasks
@targos
Copy link
Member

targos commented Sep 25, 2017

The merge was accepted for 6.2 but rejected for 6.1. Cherry-pick: #15599

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BridgeAR BridgeAR BridgeAR approved these changes

@jasnell jasnell jasnell approved these changes

@fhinkel fhinkel fhinkel approved these changes

Assignees
No one assigned
Labels
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.
8 participants
@jBarz @BridgeAR @targos @fhinkel @MylesBorins @addaleax @jasnell @nodejs-github-bot