summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorMichaël Zasso <targos@protonmail.com>2017-10-25 15:54:28 +0200
committerMichaël Zasso <targos@protonmail.com>2017-10-28 13:01:37 +0200
commitcf38d2f402930177225df03fe188dbc8cf30b9da (patch)
treeca5e4256c054abd49200033584cde8e674fa16a4 /deps
parent55a4d66843a8d98491325e807704bad3cbe0ffa6 (diff)
downloadandroid-node-v8-cf38d2f402930177225df03fe188dbc8cf30b9da.tar.gz
android-node-v8-cf38d2f402930177225df03fe188dbc8cf30b9da.tar.bz2
android-node-v8-cf38d2f402930177225df03fe188dbc8cf30b9da.zip
deps: cherry-pick 676c413 from upstream V8
Original commit message: [heap] Fix threshold for delayed chunks after 2c7561. Bug: chromium:771966 Change-Id: Iac5ee55c0d31de477f21f091f4be015a1ca8d00c Reviewed-on: https://chromium-review.googlesource.com/702382 Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Commit-Queue: Ulan Degenbaev <ulan@chromium.org> Cr-Commit-Position: refs/heads/master@{#48316} Refs: https://github.com/v8/v8/commit/676c41321a948c08d6a43de43fe9b1d60ae81c00 Refs: https://github.com/nodejs/help/issues/917#issuecomment-339292642 Refs: https://bugs.chromium.org/p/chromium/issues/detail?id=771966 PR-URL: https://github.com/nodejs/node/pull/16490 Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'deps')
-rw-r--r--deps/v8/src/heap/heap.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/v8/src/heap/heap.cc b/deps/v8/src/heap/heap.cc
index 9f29717803..b13ec784f5 100644
--- a/deps/v8/src/heap/heap.cc
+++ b/deps/v8/src/heap/heap.cc
@@ -1887,7 +1887,7 @@ void Heap::Scavenge() {
if (mark_compact_collector()->sweeper().sweeping_in_progress() &&
memory_allocator_->unmapper()->NumberOfDelayedChunks() >
- kMaxSemiSpaceSizeInKB / Page::kPageSize) {
+ static_cast<int>(new_space_->MaximumCapacity() / Page::kPageSize)) {
mark_compact_collector()->EnsureSweepingCompleted();
}