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

Revert of Re-land new insertion write barrier. (patchset #3 id:40001 of https://codereview.chromium.org/1153233003/)

Browse Source 
Reason for revert:
Deoptimizer crashes.

Original issue's description:
> Re-land new insertion write barrier.
>
> BUG=
>
> Committed: https://crrev.com/72f850458cb530d871cf3fb6442660555dc51bc2
> Cr-Commit-Position: refs/heads/master@{#29052}

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

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

Cr-Commit-Position: refs/heads/master@{#29123}
This commit is contained in:
hpayer 2015-06-18 11:04:46 -07:00 committed by Commit bot
parent 41405c0470
commit 5f88fc60e2
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/heap/incremental-marking-inl.h
View File

@ -15,14 +15,28 @@ bool IncrementalMarking::BaseRecordWrite(HeapObject* obj, Object** slot,
Object* value) { Object* value) {
HeapObject* value_heap_obj = HeapObject::cast(value); HeapObject* value_heap_obj = HeapObject::cast(value);
MarkBit value_bit = Marking::MarkBitFrom(value_heap_obj); MarkBit value_bit = Marking::MarkBitFrom(value_heap_obj);
// Checking the obj marking state is not necessary, but reduces the marking if (Marking::IsWhite(value_bit)) {
// load.
MarkBit obj_bit = Marking::MarkBitFrom(obj); MarkBit obj_bit = Marking::MarkBitFrom(obj);
if (Marking::IsWhite(value_bit) && Marking::IsBlack(obj_bit)) { 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); WhiteToGreyAndPush(value_heap_obj, value_bit);
RestartIfNotMarking(); RestartIfNotMarking();
} else {
return false;
}
} else {
BlackToGreyAndUnshift(obj, obj_bit);
RestartIfNotMarking();
return false;
}
} else {
return false;
}
} }
if (!is_compacting_) return false; if (!is_compacting_) return false;
MarkBit obj_bit = Marking::MarkBitFrom(obj);
return Marking::IsBlack(obj_bit); return Marking::IsBlack(obj_bit);
} }

7
src/heap/spaces.h
View File

@ -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) { static void IncrementLiveBytesFromGC(Address address, int by) {
MemoryChunk::FromAddress(address)->IncrementLiveBytes(by); MemoryChunk::FromAddress(address)->IncrementLiveBytes(by);
} }