Index: src/mips/assembler-mips-inl.h |
=================================================================== |
--- src/mips/assembler-mips-inl.h (revision 9780) |
+++ src/mips/assembler-mips-inl.h (working copy) |
@@ -116,10 +116,10 @@ |
} |
-void RelocInfo::set_target_address(Address target) { |
+void RelocInfo::set_target_address(Address target, WriteBarrierMode mode) { |
ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY); |
Assembler::set_target_address_at(pc_, target); |
- if (host() != NULL && IsCodeTarget(rmode_)) { |
+ if (mode == UPDATE_WRITE_BARRIER && host() != NULL && IsCodeTarget(rmode_)) { |
Object* target_code = Code::GetCodeFromTargetAddress(target); |
host()->GetHeap()->incremental_marking()->RecordWriteIntoCode( |
host(), this, HeapObject::cast(target_code)); |
@@ -150,10 +150,12 @@ |
} |
-void RelocInfo::set_target_object(Object* target) { |
+void RelocInfo::set_target_object(Object* target, WriteBarrierMode mode) { |
ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); |
Assembler::set_target_address_at(pc_, reinterpret_cast<Address>(target)); |
- if (host() != NULL && target->IsHeapObject()) { |
+ if (mode == UPDATE_WRITE_BARRIER && |
+ host() != NULL && |
+ target->IsHeapObject()) { |
host()->GetHeap()->incremental_marking()->RecordWrite( |
host(), &Memory::Object_at(pc_), HeapObject::cast(target)); |
} |
@@ -184,11 +186,12 @@ |
} |
-void RelocInfo::set_target_cell(JSGlobalPropertyCell* cell) { |
+void RelocInfo::set_target_cell(JSGlobalPropertyCell* cell, |
+ WriteBarrierMode mode) { |
ASSERT(rmode_ == RelocInfo::GLOBAL_PROPERTY_CELL); |
Address address = cell->address() + JSGlobalPropertyCell::kValueOffset; |
Memory::Address_at(pc_) = address; |
- if (host() != NULL) { |
+ if (mode == UPDATE_WRITE_BARRIER && host() != NULL) { |
// TODO(1550) We are passing NULL as a slot because cell can never be on |
// evacuation candidate. |
host()->GetHeap()->incremental_marking()->RecordWrite( |