deps: backport rehash strings after deserialization #14345

hashseed · 2017-07-18T15:22:56Z

This consists of back merges of upstream changes, fixes due to
merge conflicts, and minor changes to V8's bootstrapper when
setting up built-in objects.

Fixes: #14171
Refs: https://goo.gl/6aN8xA
Refs: https://crrev.com/a2ab1353f6708b44d305fdd9fe65a6d29b95c6d6
Refs: https://crrev.com/182caaf4a9b94024e47007d426831c024345cb97

Checklist

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

Affected core subsystem(s)

v8

hashseed · 2017-07-18T15:23:26Z

@fhinkel @MylesBorins @ofrobots

MylesBorins · 2017-07-18T15:39:41Z

CI: https://ci.nodejs.org/job/node-test-pull-request/9221/
V8-Ci: https://ci.nodejs.org/job/node-test-commit-v8-linux/793/

MylesBorins · 2017-07-18T15:43:10Z

It is worth noting that if this lands before #14004 it will need to be manually included in that PR

MylesBorins · 2017-07-18T15:45:46Z

One more thing (sorry about spam). If the first pass of CI is green we will likely want to include a revert of eff636d so we can properly tests with snapshots re-enabled

ofrobots · 2017-07-18T17:23:39Z

Thanks for putting this together. Some nits: The V8 version should also be bumped as part of the backport. I would suggest formatting the commit message as per this guide. Also, github commit urls are preferrable to crrev.com.

Something like:

deps: backport rehash strings after deserialization

Original commit messages:
https://github.com/v8/v8/commit/a2ab1353f6708b44d305fdd9fe65a6d29b95c6d6
  [snapshot] Rehash strings after deserialization.

  See https://goo.gl/6aN8xA

  Bug: v8:6593
  Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_rel_ng
  Change-Id: Ic8b0b57195d01d41591397d5d45de3f0f3ebc3d9
  Reviewed-on: https://chromium-review.googlesource.com/574527
  Reviewed-by: Camillo Bruni <cbruni@chromium.org>
  Reviewed-by: Jakob Gruber <jgruber@chromium.org>
  Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
  Commit-Queue: Yang Guo <yangguo@chromium.org>
  Cr-Commit-Position: refs/heads/master@{#46732}

https://github.com/v8/v8/182caaf4a9b94024e47007d426831c024345cb97
 Do not track transitions for built-in objects.

 Objects created during bootstrapping do not need a transition
 tree except for elements kind transitions.

 R=ishell@chromium.org

 Bug: v8:6596
 Change-Id: I237b8b2792f201336e1c9731c815095dd06bc182
 Reviewed-on: https://chromium-review.googlesource.com/571750
 Reviewed-by: Igor Sheludko <ishell@chromium.org>
 Commit-Queue: Yang Guo <yangguo@chromium.org>
 Cr-Commit-Position: refs/heads/master@{#46693}

Fixes: https://github.com/nodejs/node/issues/14171
PR-URL: https://github.com/nodejs/node/pull/14345

hashseed · 2017-07-18T18:08:44Z

Updated PR:

new commit message as suggested
re-enabled snapshot by default
bumped V8 version
rebaselined test expectation

MylesBorins · 2017-07-18T18:44:01Z

@hashseed can you give this a rebase against master, it appears a wild merge commit has appeared.

hashseed · 2017-07-19T05:10:22Z

I just rebased onto b61cab2.

hashseed · 2017-07-20T05:33:31Z

@MylesBorins could you trigger another CI run? This time with the snapshot enabled.

ofrobots · 2017-07-20T05:37:11Z

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

targos · 2017-07-20T05:45:09Z

V8 CI for the hash seed test:https://ci.nodejs.org/job/node-test-commit-v8-linux/799/

hashseed · 2017-07-20T05:49:49Z

FWIW the upstream changes do not seem to cause any issues in Chrome Canary.

Should I squash the commits so that there is only one commit, with the correctly formatted commit message?

Original commit messages: v8/v8@a2ab135 [snapshot] Rehash strings after deserialization. See https://goo.gl/6aN8xA Bug: v8:6593 Change-Id: Ic8b0b57195d01d41591397d5d45de3f0f3ebc3d9 Reviewed-on: https://chromium-review.googlesource.com/574527 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{nodejs#46732} v8/v8@182caaf Do not track transitions for built-in objects. Objects created during bootstrapping do not need a transition tree except for elements kind transitions. Bug: v8:6596 Change-Id: I237b8b2792f201336e1c9731c815095dd06bc182 Reviewed-on: https://chromium-review.googlesource.com/571750 Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{nodejs#46693} Fixes: nodejs#14171 PR-URL: nodejs#14345

hashseed · 2017-07-20T09:05:54Z

I squashed the commits together and fixed up the commit message a bit more.

refack

Rubberstamp LGTM
configure changes LGTM
Assuming test-v8 and test/pummel/test-hash-seed.js are green

refack · 2017-07-20T14:19:12Z

configure

@@ -960,7 +960,7 @@ def configure_v8(o):
  o['variables']['v8_optimized_debug'] = 0  # Compile with -O0 in debug builds.
  o['variables']['v8_random_seed'] = 0  # Use a random seed for hash tables.
  o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks.
-  o['variables']['v8_use_snapshot'] = b(options.with_snapshot)
+  o['variables']['v8_use_snapshot'] = 'false' if options.without_snapshot else 'true'


Optional: use b(want_snapshots)

This is just a revert of the commit that disabled snapshots so I'd rather not change that.

bnoordhuis

LGTM, thanks.

bnoordhuis · 2017-07-20T14:37:04Z

deps/v8/src/snapshot/deserializer.cc

@@ -151,6 +153,9 @@ MaybeHandle<Object> Deserializer::DeserializePartial(
  // changed and logging should be added to notify the profiler et al of the
  // new code, which also has to be flushed from instruction cache.
  CHECK_EQ(start_address, code_space->top());
+
+  if (FLAG_rehash_snapshot && can_rehash_) RehashContext(Context::cast(root));


For my own curiosity, root is logically always a Context here? I followed the logic down to Deserializer::ReadData() but things got complex fast from there on.

hashseed · 2017-07-20T14:54:01Z

In partial-serializer.cc we only set can_be_rehashed_ to true if we are serializing a native context, so...

bnoordhuis · 2017-07-20T14:58:15Z

Ah, okay. I wondered if it was an intrinsic property of the VisitPointer() call a few lines up.

hashseed · 2017-07-20T15:04:05Z

It doesn't really matter in practice. We really only use this to serialize contexts. Only exceptions are some ancient test cases.

addaleax · 2017-07-28T12:44:08Z

Fresh CIs because the old links give 404s:

CI: https://ci.nodejs.org/job/node-test-commit/11419/
V8 CI: https://ci.nodejs.org/view/All/job/node-test-commit-v8-linux/817/

I assume this is ready to be landed, so I’d like to merge this once CI comes back good.

addaleax · 2017-07-28T16:02:55Z

Landed in 8dce05f 🎉

Original commit messages: v8/v8@a2ab135 [snapshot] Rehash strings after deserialization. See https://goo.gl/6aN8xA Bug: v8:6593 Change-Id: Ic8b0b57195d01d41591397d5d45de3f0f3ebc3d9 Reviewed-on: https://chromium-review.googlesource.com/574527 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#46732} v8/v8@182caaf Do not track transitions for built-in objects. Objects created during bootstrapping do not need a transition tree except for elements kind transitions. Bug: v8:6596 Change-Id: I237b8b2792f201336e1c9731c815095dd06bc182 Reviewed-on: https://chromium-review.googlesource.com/571750 Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#46693} Fixes: #14171 PR-URL: #14345 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>

addaleax · 2017-07-28T16:17:01Z

I’m not sure whether that’s obvious or not, but: This doesn’t apply cleanly on v8.x-staging (V8 5.8). I guess that means we’re waiting for V8 6.0?

hashseed · 2017-07-28T16:39:07Z

I can create a PR against 5.8 of that still makes sense. I'll also check whether it applies to 6.0 if someone can point me to a branch where I can do that.

addaleax · 2017-07-28T16:41:23Z

@hashseed The PR for V8 6.0 is @ #14004, you can try to do things on top of that :) I wouldn’t worry about 5.8 for now.

MylesBorins · 2017-07-28T16:57:56Z

6.0 backport included as 2ae2874

hashseed · 2017-07-28T17:29:00Z

Thanks Myles!

Original commit messages: v8/v8@a2ab135 [snapshot] Rehash strings after deserialization. See https://goo.gl/6aN8xA Bug: v8:6593 Change-Id: Ic8b0b57195d01d41591397d5d45de3f0f3ebc3d9 Reviewed-on: https://chromium-review.googlesource.com/574527 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{nodejs#46732} v8/v8@182caaf Do not track transitions for built-in objects. Objects created during bootstrapping do not need a transition tree except for elements kind transitions. Bug: v8:6596 Change-Id: I237b8b2792f201336e1c9731c815095dd06bc182 Reviewed-on: https://chromium-review.googlesource.com/571750 Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{nodejs#46693} Fixes: nodejs#14171 PR-URL: nodejs#14345

Original commit messages: v8/v8@a2ab135 [snapshot] Rehash strings after deserialization. See https://goo.gl/6aN8xA Bug: v8:6593 Change-Id: Ic8b0b57195d01d41591397d5d45de3f0f3ebc3d9 Reviewed-on: https://chromium-review.googlesource.com/574527 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{nodejs#46732} v8/v8@182caaf Do not track transitions for built-in objects. Objects created during bootstrapping do not need a transition tree except for elements kind transitions. Bug: v8:6596 Change-Id: I237b8b2792f201336e1c9731c815095dd06bc182 Reviewed-on: https://chromium-review.googlesource.com/571750 Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{nodejs#46693} Fixes: nodejs#14171 Refs: nodejs#14345 PR-URL: nodejs#14004 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

Original commit messages: v8/v8@a2ab135 [snapshot] Rehash strings after deserialization. See https://goo.gl/6aN8xA Bug: v8:6593 Change-Id: Ic8b0b57195d01d41591397d5d45de3f0f3ebc3d9 Reviewed-on: https://chromium-review.googlesource.com/574527 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#46732} v8/v8@182caaf Do not track transitions for built-in objects. Objects created during bootstrapping do not need a transition tree except for elements kind transitions. Bug: v8:6596 Change-Id: I237b8b2792f201336e1c9731c815095dd06bc182 Reviewed-on: https://chromium-review.googlesource.com/571750 Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#46693} Fixes: #14171 Refs: #14345 PR-URL: #14004 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

Original commit messages: v8/v8@a2ab135 [snapshot] Rehash strings after deserialization. See https://goo.gl/6aN8xA Bug: v8:6593 Change-Id: Ic8b0b57195d01d41591397d5d45de3f0f3ebc3d9 Reviewed-on: https://chromium-review.googlesource.com/574527 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#46732} v8/v8@182caaf Do not track transitions for built-in objects. Objects created during bootstrapping do not need a transition tree except for elements kind transitions. Bug: v8:6596 Change-Id: I237b8b2792f201336e1c9731c815095dd06bc182 Reviewed-on: https://chromium-review.googlesource.com/571750 Reviewed-by: Igor Sheludko <ishell@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#46693} Fixes: #14171 Refs: #14345 Backport-PR-URL: #14574 Backport-Reviewed-By: Anna Henningsen <anna@addaleax.net> Backport-Reviewed-By: Refael Ackermann <refack@gmail.com> PR-URL: #14004 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

nodejs-github-bot added the v8 engine Issues and PRs related to the V8 dependency. label Jul 18, 2017

MylesBorins requested review from ofrobots and targos July 18, 2017 15:37

MylesBorins mentioned this pull request Jul 18, 2017

deps: update V8 to 6.0 #14004

Closed

8 tasks

hashseed force-pushed the rehash branch from b1160dc to fb03a5b Compare July 19, 2017 05:08

hashseed force-pushed the rehash branch from fb03a5b to 16b3c94 Compare July 20, 2017 09:00

hashseed changed the title ~~v8: rehash strings after deserialization~~ deps: backport rehash strings after deserialization. Jul 20, 2017

hashseed force-pushed the rehash branch from 16b3c94 to 404ade3 Compare July 20, 2017 09:01

hashseed changed the title ~~deps: backport rehash strings after deserialization.~~ deps: backport rehash strings after deserialization Jul 20, 2017

hashseed mentioned this pull request Jul 20, 2017

Re-enabling V8 snapshots #14171

Closed

refack approved these changes Jul 20, 2017

View reviewed changes

bnoordhuis approved these changes Jul 20, 2017

View reviewed changes

ofrobots approved these changes Jul 25, 2017

View reviewed changes

addaleax closed this Jul 28, 2017

addaleax added the backported-to-v8.x label Aug 2, 2017

hashseed deleted the rehash branch August 3, 2017 05:10

jasnell mentioned this pull request Oct 30, 2017

Proposal: 2017-10-31, Version 9.0.0 (Current) #15135

Merged

MylesBorins added the dont-land-on-v6.x label Nov 16, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

deps: backport rehash strings after deserialization #14345

deps: backport rehash strings after deserialization #14345

hashseed commented Jul 18, 2017 •

edited

Loading

hashseed commented Jul 18, 2017

MylesBorins commented Jul 18, 2017

MylesBorins commented Jul 18, 2017

MylesBorins commented Jul 18, 2017

ofrobots commented Jul 18, 2017

hashseed commented Jul 18, 2017 •

edited

Loading

MylesBorins commented Jul 18, 2017

hashseed commented Jul 19, 2017 •

edited

Loading

hashseed commented Jul 20, 2017

ofrobots commented Jul 20, 2017

targos commented Jul 20, 2017

hashseed commented Jul 20, 2017

hashseed commented Jul 20, 2017

refack left a comment

refack Jul 20, 2017

hashseed Jul 20, 2017

refack Jul 20, 2017

bnoordhuis left a comment

bnoordhuis Jul 20, 2017

hashseed commented Jul 20, 2017

bnoordhuis commented Jul 20, 2017

hashseed commented Jul 20, 2017

addaleax commented Jul 28, 2017

addaleax commented Jul 28, 2017

addaleax commented Jul 28, 2017

hashseed commented Jul 28, 2017

addaleax commented Jul 28, 2017

MylesBorins commented Jul 28, 2017 •

edited

Loading

hashseed commented Jul 28, 2017

deps: backport rehash strings after deserialization #14345

deps: backport rehash strings after deserialization #14345

Conversation

hashseed commented Jul 18, 2017 • edited Loading

Checklist

Affected core subsystem(s)

hashseed commented Jul 18, 2017

MylesBorins commented Jul 18, 2017

MylesBorins commented Jul 18, 2017

MylesBorins commented Jul 18, 2017

ofrobots commented Jul 18, 2017

hashseed commented Jul 18, 2017 • edited Loading

MylesBorins commented Jul 18, 2017

hashseed commented Jul 19, 2017 • edited Loading

hashseed commented Jul 20, 2017

ofrobots commented Jul 20, 2017

targos commented Jul 20, 2017

hashseed commented Jul 20, 2017

hashseed commented Jul 20, 2017

refack left a comment

Choose a reason for hiding this comment

refack Jul 20, 2017

Choose a reason for hiding this comment

hashseed Jul 20, 2017

Choose a reason for hiding this comment

refack Jul 20, 2017

Choose a reason for hiding this comment

bnoordhuis left a comment

Choose a reason for hiding this comment

bnoordhuis Jul 20, 2017

Choose a reason for hiding this comment

hashseed commented Jul 20, 2017

bnoordhuis commented Jul 20, 2017

hashseed commented Jul 20, 2017

addaleax commented Jul 28, 2017

addaleax commented Jul 28, 2017

addaleax commented Jul 28, 2017

hashseed commented Jul 28, 2017

addaleax commented Jul 28, 2017

MylesBorins commented Jul 28, 2017 • edited Loading

hashseed commented Jul 28, 2017

hashseed commented Jul 18, 2017 •

edited

Loading

hashseed commented Jul 18, 2017 •

edited

Loading

hashseed commented Jul 19, 2017 •

edited

Loading

MylesBorins commented Jul 28, 2017 •

edited

Loading