[Isolates] Add heap pointer to all maps and use map->heap() more.

src/mark-compact.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 352 matching lines @@
   }
 
 
   // Visit an unmarked object.
   static inline void VisitUnmarkedObject(HeapObject* obj) {
 #ifdef DEBUG
     ASSERT(HEAP->Contains(obj));
     ASSERT(!obj->IsMarked());
 #endif
     Map* map = obj->map();
-    HEAP->mark_compact_collector()->SetMark(obj);
+    map->heap()->mark_compact_collector()->SetMark(obj);
     // Mark the map pointer and the body.
-    HEAP->mark_compact_collector()->MarkObject(map);
+    map->heap()->mark_compact_collector()->MarkObject(map);
     IterateBody(map, obj);
   }
 
   // Visit all unmarked objects pointed to by [start, end).
   // Returns false if the operation fails (lack of stack space).
   static inline bool VisitUnmarkedObjects(Object** start, Object** end) {
     // Return false is we are close to the stack limit.
     StackLimitCheck check;
     if (check.HasOverflowed()) return false;
 
@@ skipping 1220 matching lines @@
     current +=
         StaticPointersToNewGenUpdatingVisitor::IterateBody(object->map(),
                                                            object);
   }
 
   // Update roots.
   heap->IterateRoots(&updating_visitor, VISIT_ALL_IN_SCAVENGE);
 
   // Update pointers in old spaces.
   heap->IterateDirtyRegions(heap->old_pointer_space(),
-                            &heap->IteratePointersInDirtyRegion,
+                            &Heap::IteratePointersInDirtyRegion,
                             &UpdatePointerToNewGen,
                             heap->WATERMARK_SHOULD_BE_VALID);
 
   heap->lo_space()->IterateDirtyRegions(&UpdatePointerToNewGen);
 
   // Update pointers from cells.
   HeapObjectIterator cell_iterator(heap->cell_space());
   for (HeapObject* cell = cell_iterator.next();
        cell != NULL;
        cell = cell_iterator.next()) {
@@ skipping 776 matching lines @@
   USE(live_cells_size);
   USE(live_news_size);
   ASSERT(live_maps_size == live_map_objects_size_);
   ASSERT(live_data_olds_size == live_old_data_objects_size_);
   ASSERT(live_pointer_olds_size == live_old_pointer_objects_size_);
   ASSERT(live_codes_size == live_code_objects_size_);
   ASSERT(live_cells_size == live_cell_objects_size_);
   ASSERT(live_news_size == live_young_objects_size_);
 
   // Flip from and to spaces
-  HEAP->new_space()->Flip();
+  heap_->new_space()->Flip();
 
-  HEAP->new_space()->MCCommitRelocationInfo();
+  heap_->new_space()->MCCommitRelocationInfo();
 
   // Set age_mark to bottom in to space
-  Address mark = HEAP->new_space()->bottom();
-  HEAP->new_space()->set_age_mark(mark);
+  Address mark = heap_->new_space()->bottom();
+  heap_->new_space()->set_age_mark(mark);
 
   PagedSpaces spaces;
   for (PagedSpace* space = spaces.next(); space != NULL; space = spaces.next())
     space->MCCommitRelocationInfo();
 
-  HEAP->CheckNewSpaceExpansionCriteria();
-  HEAP->IncrementYoungSurvivorsCounter(live_news_size);
+  heap_->CheckNewSpaceExpansionCriteria();
+  heap_->IncrementYoungSurvivorsCounter(live_news_size);
 }
 
 
 int MarkCompactCollector::RelocateMapObject(HeapObject* obj) {
   // Recover map pointer.
   MapWord encoding = obj->map_word();
   Address map_addr = encoding.DecodeMapAddress(HEAP->map_space());
   ASSERT(HEAP->map_space()->Contains(HeapObject::FromAddress(map_addr)));
 
   // Get forwarding address before resetting map pointer
@@ skipping 42 matching lines @@
 #ifdef DEBUG
   if (FLAG_gc_verbose) {
     PrintF("relocate %p -> %p\n", obj->address(), new_addr);
   }
 #endif
 
   return obj_size;
 }
 
 
 int MarkCompactCollector::RelocateOldNonCodeObject(HeapObject* obj,

[Vitaly Repeshko, 2010/09/10 12:35:25]

It'd be really nice to make MarkCompactCollector::Relocate* non-static (then we
could use the heap_ field). These methods are called by non-static
IterateLiveObjectsInRange. Should be easy to pass "this" pointer there. Feel
free to do this in a follow up change.

                                                    PagedSpace* space) {
   // Recover map pointer.
   MapWord encoding = obj->map_word();
-  Address map_addr = encoding.DecodeMapAddress(HEAP->map_space());
-  ASSERT(HEAP->map_space()->Contains(map_addr));
+  Address map_addr = encoding.DecodeMapAddress(heap_->map_space());
+  ASSERT(heap_->map_space()->Contains(map_addr));
 
   // Get forwarding address before resetting map pointer.
   Address new_addr = GetForwardingAddressInOldSpace(obj);
 
   // Reset the map pointer.
   int obj_size = RestoreMap(obj, space, new_addr, map_addr);
 
   Address old_addr = obj->address();
 
   if (new_addr != old_addr) {
     // Move contents.
-    if (space == HEAP->old_data_space()) {
-      HEAP->MoveBlock(new_addr, old_addr, obj_size);
+    if (space == heap_->old_data_space()) {
+      heap_->MoveBlock(new_addr, old_addr, obj_size);
     } else {
-      HEAP->MoveBlockToOldSpaceAndUpdateRegionMarks(new_addr,
-                                                    old_addr,
-                                                    obj_size);
+      heap_->MoveBlockToOldSpaceAndUpdateRegionMarks(new_addr,
+                                                     old_addr,
+                                                     obj_size);
     }
   }
 
   ASSERT(!HeapObject::FromAddress(new_addr)->IsCode());
 
   HeapObject* copied_to = HeapObject::FromAddress(new_addr);
   if (copied_to->IsJSFunction()) {
     PROFILE(FunctionMoveEvent(old_addr, new_addr));
   }
-  HEAP_PROFILE(ObjectMoveEvent(old_addr, new_addr));
+  HEAP_PROFILE(heap_, ObjectMoveEvent(old_addr, new_addr));
 
   return obj_size;
 }
 
 
 int MarkCompactCollector::RelocateOldPointerObject(HeapObject* obj) {
   Heap* heap = HEAP;
   return heap->mark_compact_collector()->RelocateOldNonCodeObject(
       obj, heap->old_pointer_space());
 }
 
 
 int MarkCompactCollector::RelocateOldDataObject(HeapObject* obj) {
   Heap* heap = HEAP;
   return heap->mark_compact_collector()->RelocateOldNonCodeObject(
       obj, heap->old_data_space());
 }
 
 
 int MarkCompactCollector::RelocateCellObject(HeapObject* obj) {
   Heap* heap = HEAP;
   return heap->mark_compact_collector()->RelocateOldNonCodeObject(
       obj, heap->cell_space());
 }
 
 
 int MarkCompactCollector::RelocateCodeObject(HeapObject* obj) {
   // Recover map pointer.
   MapWord encoding = obj->map_word();
-  Address map_addr = encoding.DecodeMapAddress(HEAP->map_space());
-  ASSERT(HEAP->map_space()->Contains(HeapObject::FromAddress(map_addr)));
+  Heap* heap = HEAP;
+  Address map_addr = encoding.DecodeMapAddress(heap->map_space());
+  ASSERT(heap->map_space()->Contains(HeapObject::FromAddress(map_addr)));
 
   // Get forwarding address before resetting map pointer
   Address new_addr = GetForwardingAddressInOldSpace(obj);
 
   // Reset the map pointer.
-  int obj_size = RestoreMap(obj, HEAP->code_space(), new_addr, map_addr);
+  int obj_size = RestoreMap(obj, heap->code_space(), new_addr, map_addr);
 
   Address old_addr = obj->address();
 
   if (new_addr != old_addr) {
     // Move contents.
-    HEAP->MoveBlock(new_addr, old_addr, obj_size);
+    heap->MoveBlock(new_addr, old_addr, obj_size);
   }
 
   HeapObject* copied_to = HeapObject::FromAddress(new_addr);
   if (copied_to->IsCode()) {
     // May also update inline cache target.
     Code::cast(copied_to)->Relocate(new_addr - old_addr);
     // Notify the logger that compiled code has moved.
     PROFILE(CodeMoveEvent(old_addr, new_addr));
   }
-  HEAP_PROFILE(ObjectMoveEvent(old_addr, new_addr));
+  HEAP_PROFILE(heap, ObjectMoveEvent(old_addr, new_addr));
 
   return obj_size;
 }
 
 
 int MarkCompactCollector::RelocateNewObject(HeapObject* obj) {
   int obj_size = obj->Size();
 
   // Get forwarding address
   Address old_addr = obj->address();
-  int offset = HEAP->new_space()->ToSpaceOffsetForAddress(old_addr);
+  Heap* heap = HEAP;
+  int offset = heap->new_space()->ToSpaceOffsetForAddress(old_addr);
 
   Address new_addr =
-    Memory::Address_at(HEAP->new_space()->FromSpaceLow() + offset);
+    Memory::Address_at(heap->new_space()->FromSpaceLow() + offset);
 
 #ifdef DEBUG
-  if (HEAP->new_space()->FromSpaceContains(new_addr)) {
-    ASSERT(HEAP->new_space()->FromSpaceOffsetForAddress(new_addr) <=
-           HEAP->new_space()->ToSpaceOffsetForAddress(old_addr));
+  if (heap->new_space()->FromSpaceContains(new_addr)) {
+    ASSERT(heap->new_space()->FromSpaceOffsetForAddress(new_addr) <=
+           heap->new_space()->ToSpaceOffsetForAddress(old_addr));
   } else {
-    ASSERT(HEAP->TargetSpace(obj) == HEAP->old_pointer_space() ||
-           HEAP->TargetSpace(obj) == HEAP->old_data_space());
+    ASSERT(heap->TargetSpace(obj) == heap->old_pointer_space() ||
+           heap->TargetSpace(obj) == heap->old_data_space());
   }
 #endif
 
   // New and old addresses cannot overlap.
-  if (HEAP->InNewSpace(HeapObject::FromAddress(new_addr))) {
-    HEAP->CopyBlock(new_addr, old_addr, obj_size);
+  if (heap->InNewSpace(HeapObject::FromAddress(new_addr))) {
+    heap->CopyBlock(new_addr, old_addr, obj_size);
   } else {
-    HEAP->CopyBlockToOldSpaceAndUpdateRegionMarks(new_addr,
+    heap->CopyBlockToOldSpaceAndUpdateRegionMarks(new_addr,
                                                   old_addr,
                                                   obj_size);
   }
 
 #ifdef DEBUG
   if (FLAG_gc_verbose) {
     PrintF("relocate %p -> %p\n", old_addr, new_addr);
   }
 #endif
 
   HeapObject* copied_to = HeapObject::FromAddress(new_addr);
   if (copied_to->IsJSFunction()) {
     PROFILE(FunctionMoveEvent(old_addr, new_addr));
   }
-  HEAP_PROFILE(ObjectMoveEvent(old_addr, new_addr));
+  HEAP_PROFILE(heap, ObjectMoveEvent(old_addr, new_addr));
 
   return obj_size;
 }
 
 
 void MarkCompactCollector::ReportDeleteIfNeeded(HeapObject* obj) {
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (obj->IsCode()) {
     PROFILE(CodeDeleteEvent(obj->address()));
   } else if (obj->IsJSFunction()) {
     PROFILE(FunctionDeleteEvent(obj->address()));
   }
 #endif
 }
 
 
 void MarkCompactCollector::Initialize() {
   StaticPointersToNewGenUpdatingVisitor::Initialize();
   StaticMarkingVisitor::Initialize();
 }
 
 
 } }  // namespace v8::internal