Commit 0fcf249
deps: cherry-pick bb4974d from v8 upstream
Original commit message:
[heap] Properly propagate allocated space during new space evacuaton in
MC
New space evaucation in MC supports, similar to scavenges, fall back
allocation in old space.
For new space evacuation we support sticky and non-sticky modes for
fallback. The sticky mode essentially removes the capability to allocate
in new space while the non-sticky mode only falls back for a single
allocation.
We use the non-sticky mode for allocations that are too large for a LAB
but should still go in new space. When such an allocation fails in new
space, we allocate in old space in non-sticky mode as we would still
like to reuse the remainder memory in new space. However, in such a case
we fail to properly report the space allocated in resulting in a missed
recorded slot.
BUG=chromium:641270
R=ulan@chromium.org
Review-Url: https://codereview.chromium.org/2280943002
Cr-Commit-Position: refs/heads/master@{#38940}
PR-URL: #9192
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 8bb346d commit 0fcf249
2 files changed
Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,7 @@ | |||
| 11 | 11 | #define V8_MAJOR_VERSION 5 | |
| 12 | 12 | #define V8_MINOR_VERSION 1 | |
| 13 | 13 | #define V8_BUILD_NUMBER 281 | |
| 14 | - #define V8_PATCH_LEVEL 84 | ||
| 14 | + #define V8_PATCH_LEVEL 85 | ||
| 15 | 15 | ||
| 16 | 16 | // Use 1 for candidates and 0 otherwise. | |
| 17 | 17 | // (Boolean macro values are not supported by all preprocessors.) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1674,6 +1674,7 @@ class MarkCompactCollector::EvacuateNewSpaceVisitor final | |||
| 1674 | 1674 | const int size = old_object->Size(); | |
| 1675 | 1675 | AllocationAlignment alignment = old_object->RequiredAlignment(); | |
| 1676 | 1676 | AllocationResult allocation; | |
| 1677 | + AllocationSpace space_allocated_in = space_to_allocate_; | ||
| 1677 | 1678 | if (space_to_allocate_ == NEW_SPACE) { | |
| 1678 | 1679 | if (size > kMaxLabObjectSize) { | |
| 1679 | 1680 | allocation = | |
@@ -1684,11 +1685,12 @@ class MarkCompactCollector::EvacuateNewSpaceVisitor final | |||
| 1684 | 1685 | } | |
| 1685 | 1686 | if (allocation.IsRetry() || (space_to_allocate_ == OLD_SPACE)) { | |
| 1686 | 1687 | allocation = AllocateInOldSpace(size, alignment); | |
| 1688 | + space_allocated_in = OLD_SPACE; | ||
| 1687 | 1689 | } | |
| 1688 | 1690 | bool ok = allocation.To(target_object); | |
| 1689 | 1691 | DCHECK(ok); | |
| 1690 | 1692 | USE(ok); | |
| 1691 | - return space_to_allocate_; | ||
| 1693 | + return space_allocated_in; | ||
| 1692 | 1694 | } | |
| 1693 | 1695 | ||
| 1694 | 1696 | inline bool NewLocalAllocationBuffer() { | |
0 commit comments