| Index: src/ia32/assembler-ia32-inl.h
|
| ===================================================================
|
| --- src/ia32/assembler-ia32-inl.h (revision 7889)
|
| +++ src/ia32/assembler-ia32-inl.h (working copy)
|
| @@ -89,14 +89,13 @@
|
|
|
|
|
| void RelocInfo::set_target_address(Address target, Code* code) {
|
| + Assembler::set_target_address_at(pc_, target);
|
| ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY);
|
| if (code != NULL && IsCodeTarget(rmode_)) {
|
| Object* target_code = Code::GetCodeFromTargetAddress(target);
|
| - // TODO(gc) ISOLATES MERGE code should have heap.
|
| code->GetHeap()->incremental_marking()->RecordWrite(
|
| code, HeapObject::cast(target_code));
|
| }
|
| - Assembler::set_target_address_at(pc_, target);
|
| }
|
|
|
|
|
| @@ -123,7 +122,6 @@
|
| Memory::Object_at(pc_) = target;
|
| CPU::FlushICache(pc_, sizeof(Address));
|
| if (code != NULL && target->IsHeapObject()) {
|
| - // TODO(gc) ISOLATES MERGE code object should have heap() accessor.
|
| code->GetHeap()->incremental_marking()->RecordWrite(
|
| code, HeapObject::cast(target));
|
| }
|
| @@ -159,7 +157,6 @@
|
| Memory::Address_at(pc_) = address;
|
| CPU::FlushICache(pc_, sizeof(Address));
|
| if (code != NULL) {
|
| - // TODO(gc) ISOLATES MERGE code object should have heap() accessor.
|
| code->GetHeap()->incremental_marking()->RecordWrite(code, cell);
|
| }
|
| }
|
|
|