Support compaction for code space pages.

src/incremental-marking-inl.h

 // Copyright 2011 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 16 matching lines @@
 
 #ifndef V8_INCREMENTAL_MARKING_INL_H_
 #define V8_INCREMENTAL_MARKING_INL_H_
 
 #include "incremental-marking.h"
 
 namespace v8 {
 namespace internal {
 
 
+bool IncrementalMarking::BaseRecordWrite(HeapObject* obj,
+                                         Object** slot,
+                                         Object* value) {
+  if (IsMarking() && value->IsHeapObject()) {
+    MarkBit value_bit = Marking::MarkBitFrom(HeapObject::cast(value));
+    if (Marking::IsWhite(value_bit)) {
+      MarkBit obj_bit = Marking::MarkBitFrom(obj);
+      if (Marking::IsBlack(obj_bit)) {
+        BlackToGreyAndUnshift(obj, obj_bit);
+        RestartIfNotMarking();
+      }
+
+      // Object is either grey or white it will be scanned if survives.
+      return false;
+    }
+    return true;
+  }
+  return false;
+}
+
+
 void IncrementalMarking::RecordWrite(HeapObject* obj,
                                      Object** slot,
                                      Object* value) {
+  if (BaseRecordWrite(obj, slot, value) && is_compacting_ && slot != NULL) {
+    MarkBit obj_bit = Marking::MarkBitFrom(obj);
+    if (Marking::IsBlack(obj_bit)) {
+      // Object is not going to be rescanned we need to record the slot.
+      heap_->mark_compact_collector()->RecordSlot(
+          HeapObject::RawField(obj, 0), slot, value);
+    }
+  }
+}
+
+
+void IncrementalMarking::RecordWriteIntoCode(HeapObject* obj,
+                                             RelocInfo* rinfo,
+                                             Object* value) {
   if (IsMarking() && value->IsHeapObject()) {
     MarkBit value_bit = Marking::MarkBitFrom(HeapObject::cast(value));
     if (Marking::IsWhite(value_bit)) {
       MarkBit obj_bit = Marking::MarkBitFrom(obj);
       if (Marking::IsBlack(obj_bit)) {
         BlackToGreyAndUnshift(obj, obj_bit);
         RestartIfNotMarking();
       }
 
       // Object is either grey or white it will be scanned if survives.
       return;
     }
 
-    if (is_compacting_ && slot != NULL) {
+    if (is_compacting_) {
       MarkBit obj_bit = Marking::MarkBitFrom(obj);
       if (Marking::IsBlack(obj_bit)) {
         // Object is not going to be rescanned we need to record the slot.
-        heap_->mark_compact_collector()->RecordSlot(
-            HeapObject::RawField(obj, 0), slot, value);
+        heap_->mark_compact_collector()->RecordRelocSlot(rinfo,
+                                                         Code::cast(value));
       }
     }
   }
 }
 
 
-void IncrementalMarking::RecordWriteOf(HeapObject* value) {
-  if (IsMarking()) {
-    ASSERT(!MarkCompactCollector::IsOnEvacuationCandidate(value));
-
-    MarkBit value_bit = Marking::MarkBitFrom(value);
-    if (Marking::IsWhite(value_bit)) {
-      WhiteToGreyAndPush(value, value_bit);
-      RestartIfNotMarking();
-    }
-  }
-}
-
-
 void IncrementalMarking::RecordWrites(HeapObject* obj) {
   if (IsMarking()) {
     MarkBit obj_bit = Marking::MarkBitFrom(obj);
     if (Marking::IsBlack(obj_bit)) {
       BlackToGreyAndUnshift(obj, obj_bit);
       RestartIfNotMarking();
     }
   }
 }
 
@@ skipping 34 matching lines @@
   ASSERT(Marking::MarkBitFrom(obj) == mark_bit);
   ASSERT(obj->Size() >= 2*kPointerSize);
   ASSERT(IsMarking());
   Marking::WhiteToGrey(mark_bit);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_INCREMENTAL_MARKING_INL_H_