Perform TODO(gc) cleanup for TODO-lockdown.

src/ia32/deoptimizer-ia32.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 203 matching lines @@
     PrintF(" / %x]\n", reinterpret_cast<uint32_t>(function));
 #ifdef DEBUG
     if (FLAG_print_code) {
       code->PrintLn();
     }
 #endif
   }
 }
 
 
-// TODO(gc) make use of unoptimized_code when supporting incremental marking.
 void Deoptimizer::PatchStackCheckCodeAt(Code* unoptimized_code,
                                         Address pc_after,
                                         Code* check_code,
                                         Code* replacement_code) {
   Address call_target_address = pc_after - kIntSize;
   ASSERT(check_code->entry() ==
          Assembler::target_address_at(call_target_address));
   // The stack check code matches the pattern:
   //
   //     cmp esp, <limit>
@@ skipping 11 matching lines @@
   //     test eax, <loop nesting depth>
   // ok:
   ASSERT(*(call_target_address - 3) == 0x73 &&  // jae
          *(call_target_address - 2) == 0x07 &&  // offset
          *(call_target_address - 1) == 0xe8);   // call
   *(call_target_address - 3) = 0x90;  // nop
   *(call_target_address - 2) = 0x90;  // nop
   Assembler::set_target_address_at(call_target_address,
                                    replacement_code->entry());
 
-  // TODO(gc) we are not compacting code space.
+  // TODO(1550) We are passing NULL as a slot because code can never be on
+  // evacuation candidate.
   unoptimized_code->GetHeap()->incremental_marking()->RecordWrite(
       unoptimized_code, NULL, replacement_code);
 }
 
 
 void Deoptimizer::RevertStackCheckCodeAt(Address pc_after,
                                          Code* check_code,
                                          Code* replacement_code) {
   Address call_target_address = pc_after - kIntSize;
   ASSERT(replacement_code->entry() ==
          Assembler::target_address_at(call_target_address));
   // Replace the nops from patching (Deoptimizer::PatchStackCheckCode) to
   // restore the conditional branch.
   ASSERT(*(call_target_address - 3) == 0x90 &&  // nop
          *(call_target_address - 2) == 0x90 &&  // nop
          *(call_target_address - 1) == 0xe8);   // call
   *(call_target_address - 3) = 0x73;  // jae
   *(call_target_address - 2) = 0x07;  // offset
   Assembler::set_target_address_at(call_target_address,
                                    check_code->entry());
-  // TODO(gc) ISOLATES MERGE
-  HEAP->incremental_marking()->RecordWriteOf(check_code);
+  check_code->GetHeap()->incremental_marking()->RecordWriteOf(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 509 matching lines @@
   }
   __ bind(&done);
 }
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32