Revert of [heap] Unify evacuating an object for new and old generation.

src/heap/mark-compact.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_HEAP_MARK_COMPACT_H_
 #define V8_HEAP_MARK_COMPACT_H_
 
 #include "src/base/bits.h"
 #include "src/heap/spaces.h"
 
@@ skipping 308 matching lines @@
 
 // -------------------------------------------------------------------------
 // Mark-Compact collector
 class MarkCompactCollector {
  public:
   enum IterationMode {
     kKeepMarking,
     kClearMarkbits,
   };
 
+  class EvacuateNewSpaceVisitor;
+  class EvacuateOldSpaceVisitor;
+  class HeapObjectVisitor;
+
   static void Initialize();
 
   void SetUp();
 
   void TearDown();
 
   void CollectEvacuationCandidates(PagedSpace* space);
 
   void AddEvacuationCandidate(Page* p);
 
@@ skipping 67 matching lines @@
   INLINE(void ForceRecordSlot(HeapObject* object, Object** slot,
                               Object* target));
 
   void UpdateSlots(SlotsBuffer* buffer);
   void UpdateSlotsRecordedIn(SlotsBuffer* buffer);
 
   void MigrateObject(HeapObject* dst, HeapObject* src, int size,
                      AllocationSpace to_old_space,
                      SlotsBuffer** evacuation_slots_buffer);
 
+  bool TryPromoteObject(HeapObject* object, int object_size);
+
   void InvalidateCode(Code* code);
 
   void ClearMarkbits();
 
   bool is_compacting() const { return compacting_; }
 
   MarkingParity marking_parity() { return marking_parity_; }
 
   // Concurrent and parallel sweeping support. If required_freed_bytes was set
   // to a value larger than 0, then sweeping returns after a block of at least
@@ skipping 77 matching lines @@
   }
   base::SmartPointer<FreeList>& free_list_code_space() {
     return free_list_code_space_;
   }
   base::SmartPointer<FreeList>& free_list_map_space() {
     return free_list_map_space_;
   }
 
  private:
   class CompactionTask;
-  class EvacuateNewSpaceVisitor;
-  class EvacuateOldSpaceVisitor;
-  class EvacuateVisitorBase;
-  class HeapObjectVisitor;
   class SweeperTask;
 
   explicit MarkCompactCollector(Heap* heap);
   ~MarkCompactCollector();
 
   bool WillBeDeoptimized(Code* code);
   void EvictPopularEvacuationCandidate(Page* page);
   void ClearInvalidStoreAndSlotsBufferEntries();
 
   void StartSweeperThreads();
@@ skipping 338 matching lines @@
  private:
   MarkCompactCollector* collector_;
 };
 
 
 const char* AllocationSpaceName(AllocationSpace space);
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HEAP_MARK_COMPACT_H_