Chromium Code Reviews| Index: src/ia32/assembler-ia32-inl.h |
| diff --git a/src/ia32/assembler-ia32-inl.h b/src/ia32/assembler-ia32-inl.h |
| index 7217e5c2ec667d0739308e15f77f16943860b66b..bb17fbeefdef22b81f2a2595bb2ad58bc0163e09 100644 |
| --- a/src/ia32/assembler-ia32-inl.h |
| +++ b/src/ia32/assembler-ia32-inl.h |
| @@ -94,7 +94,7 @@ void RelocInfo::set_target_address(Address target, Code* code) { |
| if (code != NULL && IsCodeTarget(rmode_)) { |
| Object* target_code = Code::GetCodeFromTargetAddress(target); |
| code->GetHeap()->incremental_marking()->RecordWrite( |
| - code, HeapObject::cast(target_code)); |
| + code, NULL, HeapObject::cast(target_code)); |
|
Erik Corry
2011/07/04 11:04:11
Is this 'NULL' OK because we cannot compact code s
Vyacheslav Egorov (Chromium)
2011/08/05 12:50:28
Done.
|
| } |
| } |
| @@ -123,7 +123,7 @@ void RelocInfo::set_target_object(Object* target, Code* code) { |
| CPU::FlushICache(pc_, sizeof(Address)); |
| if (code != NULL && target->IsHeapObject()) { |
| code->GetHeap()->incremental_marking()->RecordWrite( |
| - code, HeapObject::cast(target)); |
| + code, &Memory::Object_at(pc_), HeapObject::cast(target)); |
| } |
| } |
| @@ -157,7 +157,9 @@ void RelocInfo::set_target_cell(JSGlobalPropertyCell* cell, Code* code) { |
| Memory::Address_at(pc_) = address; |
| CPU::FlushICache(pc_, sizeof(Address)); |
| if (code != NULL) { |
| - code->GetHeap()->incremental_marking()->RecordWrite(code, cell); |
| + // TODO(gc) We are not compacting cell space. |
| + code->GetHeap()->incremental_marking()->RecordWrite( |
| + code, NULL, cell); |
| } |
| } |