Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: src/heap/mark-compact-inl.h

Issue 2183383004: Revert of [heap] Reland "Remove black pages and use black areas instead." (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/heap/mark-compact.cc ('k') | src/heap/marking.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/mark-compact-inl.h
diff --git a/src/heap/mark-compact-inl.h b/src/heap/mark-compact-inl.h
index d3a6719667db66dc4c3862685dfb9117e46210ce..ceca4c4d8ce7c1ccd5b3c04486aca391b157dfc9 100644
--- a/src/heap/mark-compact-inl.h
+++ b/src/heap/mark-compact-inl.h
@@ -153,38 +153,20 @@
cell_base_ = it_.CurrentCellBase();
current_cell_ = *it_.CurrentCell();
}
-
- if (current_cell_ & second_bit_index) {
- // We found a black object. If the black object is within a black area,
- // make sure that we skip all set bits in the black area until the
- // object ends.
- HeapObject* black_object = HeapObject::FromAddress(addr);
- Address end = addr + black_object->Size() - kPointerSize;
- DCHECK_EQ(chunk_, MemoryChunk::FromAddress(end));
- uint32_t end_mark_bit_index = chunk_->AddressToMarkbitIndex(end);
- unsigned int end_cell_index =
- end_mark_bit_index >> Bitmap::kBitsPerCellLog2;
- MarkBit::CellType end_index_mask =
- 1u << Bitmap::IndexInCell(end_mark_bit_index);
- if (it_.Advance(end_cell_index)) {
- cell_base_ = it_.CurrentCellBase();
- current_cell_ = *it_.CurrentCell();
- }
-
- // Clear all bits in current_cell, including the end index.
- current_cell_ &= ~(end_index_mask + end_index_mask - 1);
-
- if (T == kBlackObjects || T == kAllLiveObjects) {
- object = black_object;
- }
- } else if ((T == kGreyObjects || T == kAllLiveObjects)) {
+ if (T == kBlackObjects && (current_cell_ & second_bit_index)) {
+ object = HeapObject::FromAddress(addr);
+ } else if (T == kGreyObjects && !(current_cell_ & second_bit_index)) {
+ object = HeapObject::FromAddress(addr);
+ } else if (T == kAllLiveObjects) {
object = HeapObject::FromAddress(addr);
}
+
+ // Clear the second bit of the found object.
+ current_cell_ &= ~second_bit_index;
// We found a live object.
if (object != nullptr) break;
}
-
if (current_cell_ == 0) {
if (!it_.Done()) {
it_.Advance();
« no previous file with comments | « src/heap/mark-compact.cc ('k') | src/heap/marking.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698