- Cleaned up Heap::CopyObject. Inlined fast case.

src/heap.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 666 matching lines @@
   }
 
   static void TracePathToObject();
   static void TracePathToGlobal();
 #endif
 
   // Callback function pased to Heap::Iterate etc.  Copies an object if
   // necessary, the object might be promoted to an old space.  The caller must
   // ensure the precondition that the object is (a) a heap object and (b) in
   // the heap's from space.
-  static void CopyObject(HeapObject** p);
+  static void ScavengePointer(HeapObject** p);
+  static inline void ScavengeObject(HeapObject** p, HeapObject* object);
 
   // Clear a range of remembered set addresses corresponding to the object
   // area address 'start' with size 'size_in_bytes', eg, when adding blocks
   // to the free list.
   static void ClearRSetRange(Address start, int size_in_bytes);
 
   // Rebuild remembered set in old and map spaces.
   static void RebuildRSets();
 
   //
@@ skipping 176 matching lines @@
 
   // Update an old object's remembered set
   static int UpdateRSet(HeapObject* obj);
 
   // Rebuild remembered set in an old space.
   static void RebuildRSets(PagedSpace* space);
 
   // Rebuild remembered set in the large object space.
   static void RebuildRSets(LargeObjectSpace* space);
 
+  // Slow part of scavenge object.
+  static void ScavengeObjectSlow(HeapObject** p, HeapObject* object);
+
   static const int kInitialSymbolTableSize = 2048;
   static const int kInitialEvalCacheSize = 64;
 
   friend class Factory;
   friend class DisallowAllocationFailure;
 };
 
 
 #ifdef DEBUG
 // Visitor class to verify interior pointers that do not have remembered set
@@ skipping 286 matching lines @@
   int marked_count_;
 
   // The count from the end of the previous full GC.  Will be zero if there
   // was no previous full GC.
   int previous_marked_count_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_H_