diff options
| author | Michaël Zasso <targos@protonmail.com> | 2021-01-12 15:20:25 +0100 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2021-02-11 19:10:48 +0100 |
| commit | 00e1c7ea83b6e2cc098e3b123800149047c30c7d (patch) | |
| tree | e84f17e7be0c7a53a884fc5e50971b0c29adf0c7 | |
| parent | ee01d6b7fc7746153e47915f2210b453fe0e0530 (diff) | |
| download | node-new-00e1c7ea83b6e2cc098e3b123800149047c30c7d.tar.gz | |
deps: V8: cherry-pick 9a6a22874c81
Original commit message:
[heap] Fix DCHECK in TransitionArrayNeedsCompaction
The dead target check in TransitionArrayNeedsCompaction, confirming that
Smi (uninitialized) targets imply that no other target is dead, has to
additionally support Smi entries.
Bug: v8:11305
Change-Id: I6f3fa9e7420b1bd0a64a25dae670f439e3f41162
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2622914
Commit-Queue: Leszek Swirski <leszeks@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Auto-Submit: Leszek Swirski <leszeks@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72040}
Refs: https://github.com/v8/v8/commit/9a6a22874c814be0a3ad12065b386722df110df5
PR-URL: https://github.com/nodejs/node/pull/36139
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
| -rw-r--r-- | common.gypi | 2 | ||||
| -rw-r--r-- | deps/v8/src/heap/mark-compact.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi index 2eb9d1d684..16165ed5c9 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.18', + 'v8_embedder_string': '-node.19', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/heap/mark-compact.cc b/deps/v8/src/heap/mark-compact.cc index ea1902c972..8801ef9cf4 100644 --- a/deps/v8/src/heap/mark-compact.cc +++ b/deps/v8/src/heap/mark-compact.cc @@ -2301,7 +2301,9 @@ bool MarkCompactCollector::TransitionArrayNeedsCompaction( #ifdef DEBUG // Targets can only be dead iff this array is fully deserialized. for (int i = 0; i < num_transitions; ++i) { - DCHECK(!non_atomic_marking_state()->IsWhite(transitions.GetTarget(i))); + DCHECK_IMPLIES( + !transitions.GetRawTarget(i).IsSmi(), + !non_atomic_marking_state()->IsWhite(transitions.GetTarget(i))); } #endif return false; |