Skip to content

Commit

Permalink
Revert of New insertion write barrier. (patchset v8#3 id:200001 of ht…
Browse files Browse the repository at this point in the history
…tps://codereview.chromium.org/1073953006/)

Reason for revert:
Various performance regressions.

Original issue's description:
> New insertion write barrier.
>
> BUG=
>
> Committed: https://crrev.com/6e9e2c08292b553602c74b16b8ccff4e4ccac003
> Cr-Commit-Position: refs/heads/master@{#28199}

TBR=ulan@chromium.org,erikcorry@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/1131583002

Cr-Commit-Position: refs/heads/master@{#28265}
  • Loading branch information
hannespayer authored and Commit bot committed May 6, 2015
1 parent 9f55ccb commit 74654d3
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
20 changes: 18 additions & 2 deletions src/heap/incremental-marking-inl.h
Expand Up @@ -16,8 +16,24 @@ bool IncrementalMarking::BaseRecordWrite(HeapObject* obj, Object** slot,
HeapObject* value_heap_obj = HeapObject::cast(value);
MarkBit value_bit = Marking::MarkBitFrom(value_heap_obj);
if (Marking::IsWhite(value_bit)) {
WhiteToGreyAndPush(value_heap_obj, value_bit);
RestartIfNotMarking();
MarkBit obj_bit = Marking::MarkBitFrom(obj);
if (Marking::IsBlack(obj_bit)) {
MemoryChunk* chunk = MemoryChunk::FromAddress(obj->address());
if (chunk->IsFlagSet(MemoryChunk::HAS_PROGRESS_BAR)) {
if (chunk->IsLeftOfProgressBar(slot)) {
WhiteToGreyAndPush(value_heap_obj, value_bit);
RestartIfNotMarking();
} else {
return false;
}
} else {
BlackToGreyAndUnshift(obj, obj_bit);
RestartIfNotMarking();
return false;
}
} else {
return false;
}
}
if (!is_compacting_) return false;
MarkBit obj_bit = Marking::MarkBitFrom(obj);
Expand Down
7 changes: 7 additions & 0 deletions src/heap/spaces.h
Expand Up @@ -508,6 +508,13 @@ class MemoryChunk {
}
}

bool IsLeftOfProgressBar(Object** slot) {
Address slot_address = reinterpret_cast<Address>(slot);
DCHECK(slot_address > this->address());
return (slot_address - (this->address() + kObjectStartOffset)) <
progress_bar();
}

static void IncrementLiveBytesFromGC(Address address, int by) {
MemoryChunk::FromAddress(address)->IncrementLiveBytes(by);
}
Expand Down

0 comments on commit 74654d3

Please sign in to comment.