| Index: src/heap/mark-compact.h
|
| diff --git a/src/heap/mark-compact.h b/src/heap/mark-compact.h
|
| index cfb2d9d27022f033341acce33c68212faa8ac31a..ab6a3416808198ff05999b10f0a1279627947601 100644
|
| --- a/src/heap/mark-compact.h
|
| +++ b/src/heap/mark-compact.h
|
| @@ -406,7 +406,8 @@ class MarkCompactCollector {
|
|
|
| void MigrateObject(HeapObject* dst, HeapObject* src, int size,
|
| AllocationSpace to_old_space,
|
| - SlotsBuffer** evacuation_slots_buffer);
|
| + SlotsBuffer** evacuation_slots_buffer,
|
| + LocalStoreBuffer* local_store_buffer);
|
|
|
| void InvalidateCode(Code* code);
|
|
|
| @@ -511,8 +512,6 @@ class MarkCompactCollector {
|
| class HeapObjectVisitor;
|
| class SweeperTask;
|
|
|
| - static const int kInitialLocalPretenuringFeedbackCapacity = 256;
|
| -
|
| explicit MarkCompactCollector(Heap* heap);
|
|
|
| bool WillBeDeoptimized(Code* code);
|
| @@ -699,9 +698,7 @@ class MarkCompactCollector {
|
| void SweepSpaces();
|
|
|
| void EvacuateNewSpacePrologue();
|
| -
|
| - // Returns local pretenuring feedback.
|
| - HashMap* EvacuateNewSpaceInParallel();
|
| + void EvacuateNewSpaceEpilogue();
|
|
|
| void AddEvacuationSlotsBufferSynchronized(
|
| SlotsBuffer* evacuation_slots_buffer);
|
| @@ -752,7 +749,8 @@ class MarkCompactCollector {
|
|
|
| // Updates store buffer and slot buffer for a pointer in a migrating object.
|
| void RecordMigratedSlot(Object* value, Address slot,
|
| - SlotsBuffer** evacuation_slots_buffer);
|
| + SlotsBuffer** evacuation_slots_buffer,
|
| + LocalStoreBuffer* local_store_buffer);
|
|
|
| // Adds the code entry slot to the slots buffer.
|
| void RecordMigratedCodeEntrySlot(Address code_entry, Address code_entry_slot,
|
| @@ -777,9 +775,7 @@ class MarkCompactCollector {
|
| CodeFlusher* code_flusher_;
|
| bool have_code_to_deoptimize_;
|
|
|
| - List<Page*> evacuation_candidates_;
|
| -
|
| - List<MemoryChunk*> newspace_evacuation_candidates_;
|
| + List<MemoryChunk*> evacuation_candidates_;
|
|
|
| // The evacuation_slots_buffers_ are used by the compaction threads.
|
| // When a compaction task finishes, it uses
|
|
|