Merge experimental/gc branch to the bleeding_edge.

src/arm/deoptimizer-arm.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 116 matching lines @@
     PrintF(" / %x]\n", reinterpret_cast<uint32_t>(function));
 #ifdef DEBUG
     if (FLAG_print_code) {
       code->PrintLn();
     }
 #endif
   }
 }
 
 
-void Deoptimizer::PatchStackCheckCodeAt(Address pc_after,
+void Deoptimizer::PatchStackCheckCodeAt(Code* unoptimized_code,
+                                        Address pc_after,
                                         Code* check_code,
                                         Code* replacement_code) {
   const int kInstrSize = Assembler::kInstrSize;
   // The call of the stack guard check has the following form:
   //  e1 5d 00 0c       cmp sp, <limit>
   //  2a 00 00 01       bcs ok
   //  e5 9f c? ??       ldr ip, [pc, <stack guard address>]
   //  e1 2f ff 3c       blx ip
   ASSERT(Memory::int32_at(pc_after - kInstrSize) ==
       (al | B24 | B21 | 15*B16 | 15*B12 | 15*B8 | BLX | ip.code()));
@@ skipping 14 matching lines @@
 
   // Replace the stack check address in the constant pool
   // with the entry address of the replacement code.
   uint32_t stack_check_address_offset = Memory::uint16_at(pc_after -
       2 * kInstrSize) & 0xfff;
   Address stack_check_address_pointer = pc_after + stack_check_address_offset;
   ASSERT(Memory::uint32_at(stack_check_address_pointer) ==
          reinterpret_cast<uint32_t>(check_code->entry()));
   Memory::uint32_at(stack_check_address_pointer) =
       reinterpret_cast<uint32_t>(replacement_code->entry());
+
+  RelocInfo rinfo(pc_after - 2 * kInstrSize,
+                  RelocInfo::CODE_TARGET,
+                  NULL,
+                  unoptimized_code);
+  unoptimized_code->GetHeap()->incremental_marking()->RecordWriteIntoCode(
+      unoptimized_code, &rinfo, replacement_code);
 }
 
 
 void Deoptimizer::RevertStackCheckCodeAt(Address pc_after,
                                          Code* check_code,
                                          Code* replacement_code) {
   const int kInstrSize = Assembler::kInstrSize;
   ASSERT(Memory::uint32_at(pc_after - kInstrSize) == 0xe12fff3c);
   ASSERT(Memory::uint8_at(pc_after - kInstrSize - 1) == 0xe5);
   ASSERT(Memory::uint8_at(pc_after - kInstrSize - 2) == 0x9f);
 
   // Replace NOP with conditional jump.
   CodePatcher patcher(pc_after - 3 * kInstrSize, 1);
   patcher.masm()->b(+4, cs);
 
   // Replace the stack check address in the constant pool
   // with the entry address of the replacement code.
   uint32_t stack_check_address_offset = Memory::uint16_at(pc_after -
       2 * kInstrSize) & 0xfff;
   Address stack_check_address_pointer = pc_after + stack_check_address_offset;
   ASSERT(Memory::uint32_at(stack_check_address_pointer) ==
          reinterpret_cast<uint32_t>(replacement_code->entry()));
   Memory::uint32_at(stack_check_address_pointer) =
       reinterpret_cast<uint32_t>(check_code->entry());
+
+  check_code->GetHeap()->incremental_marking()->
+      RecordCodeTargetPatch(pc_after - 2 * kInstrSize, check_code);
 }
 
 
 static int LookupBailoutId(DeoptimizationInputData* data, unsigned ast_id) {
   ByteArray* translations = data->TranslationByteArray();
   int length = data->DeoptCount();
   for (int i = 0; i < length; i++) {
     if (static_cast<unsigned>(data->AstId(i)->value()) == ast_id) {
       TranslationIterator it(translations,  data->TranslationIndex(i)->value());
       int value = it.Next();
@@ skipping 565 matching lines @@
     __ push(ip);
     __ b(&done);
     ASSERT(masm()->pc_offset() - start == table_entry_size_);
   }
   __ bind(&done);
 }
 
 #undef __
 
 } }  // namespace v8::internal