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

src/heap-inl.h

 // 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 249 matching lines @@
   ASSERT(IsAligned(byte_size, kPointerSize));
 
   Page* page = Page::FromAddress(dst);
   uint32_t marks = page->GetRegionMarks();
 
   for (int remaining = byte_size / kPointerSize;
        remaining > 0;
        remaining--) {
     Memory::Object_at(dst) = Memory::Object_at(src);
 
-    if (Heap::InNewSpace(Memory::Object_at(dst))) {
+    if (InNewSpace(Memory::Object_at(dst))) {
       marks |= page->GetRegionMaskForAddress(dst);
     }
 
     dst += kPointerSize;
     src += kPointerSize;
   }
 
   page->SetRegionMarks(marks);
 }
 
@@ skipping 25 matching lines @@
                                                    Address src,
                                                    int byte_size) {
   ASSERT(IsAligned(byte_size, kPointerSize));
   ASSERT((dst >= (src + byte_size)) ||
          ((OffsetFrom(src) - OffsetFrom(dst)) >= kPointerSize));
 
   CopyBlockToOldSpaceAndUpdateRegionMarks(dst, src, byte_size);
 }
 
 
+void Heap::ScavengePointer(HeapObject** p) {
+  ScavengeObject(p, *p);
+}
+
+
 void Heap::ScavengeObject(HeapObject** p, HeapObject* object) {
-  ASSERT(InFromSpace(object));
+  ASSERT(HEAP->InFromSpace(object));
 
   // We use the first word (where the map pointer usually is) of a heap
   // object to record the forwarding pointer.  A forwarding pointer can
   // point to an old space, the code space, or the to space of the new
   // generation.
   MapWord first_word = object->map_word();
 
   // If the first word is a forwarding address, the object has already been
   // copied.
   if (first_word.IsForwardingAddress()) {
@@ skipping 240 matching lines @@
 #ifdef DEBUG
   UpdateLiveObjectCount(obj);
 #endif
   obj->SetMark();
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_INL_H_