AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[heap] Fix Heap::MoveElements for concurrent marker.

Browse Source 
BUG=chromium:694255

Change-Id: I1e8104831a9d31177bfaffc2a99300e2022edfd3
Reviewed-on: https://chromium-review.googlesource.com/544918
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46126}
This commit is contained in:
Ulan Degenbaev 2017-06-22 13:01:18 +02:00 committed by Commit Bot
parent 4a635150f1
commit bdc108eab8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/heap/heap.cc
View File

@ -1130,9 +1130,16 @@ void Heap::MoveElements(FixedArray* array, int dst_index, int src_index,
Object** dst = array->data_start() + dst_index;
Object** src = array->data_start() + src_index;
if (FLAG_concurrent_marking && concurrent_marking()->IsTaskPending()) {
for (int i = 0; i < len; i++) {
base::AsAtomicWord::Relaxed_Store(
dst + i, base::AsAtomicWord::Relaxed_Load(src + i));
if (dst < src) {
for (int i = 0; i < len; i++) {
base::AsAtomicWord::Relaxed_Store(
dst + i, base::AsAtomicWord::Relaxed_Load(src + i));
}
} else {
for (int i = len - 1; i >= 0; i--) {
base::AsAtomicWord::Relaxed_Store(
dst + i, base::AsAtomicWord::Relaxed_Load(src + i));
}
}
} else {
MemMove(dst, src, len * kPointerSize);
@ -3305,7 +3312,8 @@ void Heap::RightTrimFixedArray(FixedArrayBase* object, int elements_to_trim) {
// Clear the mark bits of the black area that belongs now to the filler.
// This is an optimization. The sweeper will release black fillers anyway.
if (incremental_marking()->black_allocation() &&
ObjectMarking::IsBlackOrGrey(filler, MarkingState::Internal(filler))) {
ObjectMarking::IsBlackOrGrey<IncrementalMarking::kAtomicity>(
filler, MarkingState::Internal(filler))) {
Page* page = Page::FromAddress(new_end);
MarkingState::Internal(page).bitmap()->ClearRange(
page->AddressToMarkbitIndex(new_end),