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

Revert of [heap] Unify evacuating an object for new and old generation. (patchset #2 id:20001 of https://codereview.chromium.org/1481873002/ )

Reason for revert:
Still investigating bad canary.

Original issue's description:
> [heap] Unify evacuating an object for new and old generation.
>
> BUG=chromium:524425
> LOG=N
>
> Committed: https://crrev.com/afb8bcce8ba889280ed747eb218d287ddd233b4a
> Cr-Commit-Position: refs/heads/master@{#32365}

TBR=mlippautz@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:524425

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

Cr-Commit-Position: refs/heads/master@{#32460}

src/heap/mark-compact.cc

@@ -1532,51 +1532,18 @@ class MarkCompactCollector::HeapObjectVisitor {
 };
 
 
-class MarkCompactCollector::EvacuateVisitorBase
-    : public MarkCompactCollector::HeapObjectVisitor {
- public:
-  EvacuateVisitorBase(Heap* heap, SlotsBuffer** evacuation_slots_buffer)
-      : heap_(heap), evacuation_slots_buffer_(evacuation_slots_buffer) {}
-
-  bool TryEvacuateObject(PagedSpace* target_space, HeapObject* object,
-                         HeapObject** target_object) {
-    int size = object->Size();
-    AllocationAlignment alignment = object->RequiredAlignment();
-    AllocationResult allocation = target_space->AllocateRaw(size, alignment);
-    if (allocation.To(target_object)) {
-      heap_->mark_compact_collector()->MigrateObject(
-          *target_object, object, size, target_space->identity(),
-          evacuation_slots_buffer_);
-      return true;
-    }
-    return false;
-  }
-
- protected:
-  Heap* heap_;
-  SlotsBuffer** evacuation_slots_buffer_;
-};
-
-
 class MarkCompactCollector::EvacuateNewSpaceVisitor
-    : public MarkCompactCollector::EvacuateVisitorBase {
+    : public MarkCompactCollector::HeapObjectVisitor {
  public:
-  explicit EvacuateNewSpaceVisitor(Heap* heap,
-                                   SlotsBuffer** evacuation_slots_buffer)
-      : EvacuateVisitorBase(heap, evacuation_slots_buffer) {}
+  explicit EvacuateNewSpaceVisitor(Heap* heap) : heap_(heap) {}
 
   virtual bool Visit(HeapObject* object) {
     Heap::UpdateAllocationSiteFeedback(object, Heap::RECORD_SCRATCHPAD_SLOT);
     int size = object->Size();
-    HeapObject* target_object = nullptr;
+
+    // TODO(hpayer): Refactor EvacuateObject and call this function instead.
     if (heap_->ShouldBePromoted(object->address(), size) &&
-        TryEvacuateObject(heap_->old_space(), object, &target_object)) {
-      // If we end up needing more special cases, we should factor this out.
-      if (V8_UNLIKELY(target_object->IsJSArrayBuffer())) {
-        heap_->array_buffer_tracker()->Promote(
-            JSArrayBuffer::cast(target_object));
-      }
-      heap_->IncrementPromotedObjectsSize(size);
+        heap_->mark_compact_collector()->TryPromoteObject(object, size)) {
       return true;
     }
 
@@ -1603,31 +1570,43 @@ class MarkCompactCollector::EvacuateNewSpaceVisitor
     heap_->IncrementSemiSpaceCopiedObjectSize(size);
     return true;
   }
+
+ private:
+  Heap* heap_;
 };
 
 
 class MarkCompactCollector::EvacuateOldSpaceVisitor
-    : public MarkCompactCollector::EvacuateVisitorBase {
+    : public MarkCompactCollector::HeapObjectVisitor {
  public:
   EvacuateOldSpaceVisitor(Heap* heap,
                           CompactionSpaceCollection* compaction_spaces,
                           SlotsBuffer** evacuation_slots_buffer)
-      : EvacuateVisitorBase(heap, evacuation_slots_buffer),
-        compaction_spaces_(compaction_spaces) {}
+      : heap_(heap),
+        compaction_spaces_(compaction_spaces),
+        evacuation_slots_buffer_(evacuation_slots_buffer) {}
 
   virtual bool Visit(HeapObject* object) {
-    CompactionSpace* target_space = compaction_spaces_->Get(
-        Page::FromAddress(object->address())->owner()->identity());
+    int size = object->Size();
+    AllocationAlignment alignment = object->RequiredAlignment();
     HeapObject* target_object = nullptr;
-    if (TryEvacuateObject(target_space, object, &target_object)) {
-      DCHECK(object->map_word().IsForwardingAddress());
-      return true;
+    AllocationSpace id =
+        Page::FromAddress(object->address())->owner()->identity();
+    AllocationResult allocation =
+        compaction_spaces_->Get(id)->AllocateRaw(size, alignment);
+    if (!allocation.To(&target_object)) {
+      return false;
     }
-    return false;
+    heap_->mark_compact_collector()->MigrateObject(
+        target_object, object, size, id, evacuation_slots_buffer_);
+    DCHECK(object->map_word().IsForwardingAddress());
+    return true;
   }
 
  private:
+  Heap* heap_;
   CompactionSpaceCollection* compaction_spaces_;
+  SlotsBuffer** evacuation_slots_buffer_;
 };
 
 
@@ -2987,6 +2966,28 @@ static String* UpdateReferenceInExternalStringTableEntry(Heap* heap,
 }
 
 
+bool MarkCompactCollector::TryPromoteObject(HeapObject* object,
+                                            int object_size) {
+  OldSpace* old_space = heap()->old_space();
+
+  HeapObject* target = nullptr;
+  AllocationAlignment alignment = object->RequiredAlignment();
+  AllocationResult allocation = old_space->AllocateRaw(object_size, alignment);
+  if (allocation.To(&target)) {
+    MigrateObject(target, object, object_size, old_space->identity(),
+                  &migration_slots_buffer_);
+    // If we end up needing more special cases, we should factor this out.
+    if (V8_UNLIKELY(target->IsJSArrayBuffer())) {
+      heap()->array_buffer_tracker()->Promote(JSArrayBuffer::cast(target));
+    }
+    heap()->IncrementPromotedObjectsSize(object_size);
+    return true;
+  }
+
+  return false;
+}
+
+
 bool MarkCompactCollector::IsSlotInBlackObject(Page* p, Address slot,
                                                HeapObject** out_object) {
   Space* owner = p->owner();
@@ -3159,7 +3160,7 @@ void MarkCompactCollector::EvacuateNewSpace() {
   // new entries in the store buffer and may cause some pages to be marked
   // scan-on-scavenge.
   NewSpacePageIterator it(from_bottom, from_top);
-  EvacuateNewSpaceVisitor new_space_visitor(heap(), &migration_slots_buffer_);
+  EvacuateNewSpaceVisitor new_space_visitor(heap());
   while (it.has_next()) {
     NewSpacePage* p = it.next();
     survivors_size += p->LiveBytes();

src/heap/mark-compact.h

@@ -319,6 +319,10 @@ class MarkCompactCollector {
     kClearMarkbits,
   };
 
+  class EvacuateNewSpaceVisitor;
+  class EvacuateOldSpaceVisitor;
+  class HeapObjectVisitor;
+
   static void Initialize();
 
   void SetUp();
@@ -405,6 +409,8 @@ class MarkCompactCollector {
                      AllocationSpace to_old_space,
                      SlotsBuffer** evacuation_slots_buffer);
 
+  bool TryPromoteObject(HeapObject* object, int object_size);
+
   void InvalidateCode(Code* code);
 
   void ClearMarkbits();
@@ -502,10 +508,6 @@ class MarkCompactCollector {
 
  private:
   class CompactionTask;
-  class EvacuateNewSpaceVisitor;
-  class EvacuateOldSpaceVisitor;
-  class EvacuateVisitorBase;
-  class HeapObjectVisitor;
   class SweeperTask;
 
   explicit MarkCompactCollector(Heap* heap);