Fix two bugs in the code compaction:

src/incremental-marking.cc

 // 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 68 matching lines @@
                                                           Object** slot,
                                                           Isolate* isolate) {
   IncrementalMarking* marking = isolate->heap()->incremental_marking();
   ASSERT(marking->is_compacting_);
   marking->RecordWrite(obj, slot, *slot);
 }
 
 
 void IncrementalMarking::RecordCodeTargetPatch(Address pc, HeapObject* value) {
   if (IsMarking()) {
-    ASSERT(!MarkCompactCollector::IsOnEvacuationCandidate(value));
-
-    MarkBit value_bit = Marking::MarkBitFrom(value);
-    if (Marking::IsWhite(value_bit)) {
-      WhiteToGreyAndPush(value, value_bit);
-      RestartIfNotMarking();
-    }
-
-
-    if (is_compacting_) {
-      RelocInfo rinfo(pc, RelocInfo::CODE_TARGET, NULL, NULL);
-      heap_->mark_compact_collector()->RecordRelocSlot(&rinfo,
-                                                       Code::cast(value));
-    }
+    Code* host =
+        heap_->isolate()->pc_to_code_cache()->GcSafeFindCodeForPc(pc);
+    RelocInfo rinfo(pc, RelocInfo::CODE_TARGET, NULL, host);
+    RecordWriteIntoCode(host, &rinfo, value);
   }
 }
 
 
 void IncrementalMarking::RecordWriteOfCodeEntry(JSFunction* host,
                                                 Object** slot,
                                                 Code* value) {
   if (BaseRecordWrite(host, slot, value) && is_compacting_) {
     ASSERT(slot != NULL);
     heap_->mark_compact_collector()->
@@ skipping 587 matching lines @@
   bytes_rescanned_ = 0;
   allocation_marking_factor_ = kInitialAllocationMarkingFactor;
 }
 
 
 int64_t IncrementalMarking::SpaceLeftInOldSpace() {
   return heap_->MaxOldGenerationSize() - heap_->PromotedSpaceSize();
 }
 
 } }  // namespace v8::internal