| Index: src/x64/assembler-x64-inl.h
|
| diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h
|
| index 285c07812fd555aeb280a6507609440edb0687b2..0b3f470abb6107a8749e6df67763c0692f3491f2 100644
|
| --- a/src/x64/assembler-x64-inl.h
|
| +++ b/src/x64/assembler-x64-inl.h
|
| @@ -232,14 +232,13 @@ int RelocInfo::target_address_size() {
|
| }
|
|
|
|
|
| -void RelocInfo::set_target_address(Address target) {
|
| + void RelocInfo::set_target_address(Address target, Code* code) {
|
| ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY);
|
| - if (IsCodeTarget(rmode_)) {
|
| - Assembler::set_target_address_at(pc_, target);
|
| - } else {
|
| - Memory::Address_at(pc_) = target;
|
| - CPU::FlushICache(pc_, sizeof(Address));
|
| + if (code != NULL && IsCodeTarget(rmode_)) {
|
| + Object* target_code = Code::GetCodeFromTargetAddress(target);
|
| + IncrementalMarking::RecordWrite(code, HeapObject::cast(target_code));
|
| }
|
| + Assembler::set_target_address_at(pc_, target);
|
| }
|
|
|
|
|
| @@ -271,10 +270,13 @@ Address* RelocInfo::target_reference_address() {
|
| }
|
|
|
|
|
| -void RelocInfo::set_target_object(Object* target) {
|
| +void RelocInfo::set_target_object(Object* target, Code* code) {
|
| ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| *reinterpret_cast<Object**>(pc_) = target;
|
| CPU::FlushICache(pc_, sizeof(Address));
|
| + if (code != NULL && target->IsHeapObject()) {
|
| + IncrementalMarking::RecordWrite(code, HeapObject::cast(target));
|
| + }
|
| }
|
|
|
|
|
| @@ -295,11 +297,12 @@ JSGlobalPropertyCell* RelocInfo::target_cell() {
|
| }
|
|
|
|
|
| -void RelocInfo::set_target_cell(JSGlobalPropertyCell* cell) {
|
| + void RelocInfo::set_target_cell(JSGlobalPropertyCell* cell, Code* code) {
|
| ASSERT(rmode_ == RelocInfo::GLOBAL_PROPERTY_CELL);
|
| Address address = cell->address() + JSGlobalPropertyCell::kValueOffset;
|
| Memory::Address_at(pc_) = address;
|
| CPU::FlushICache(pc_, sizeof(Address));
|
| + if (code != NULL) IncrementalMarking::RecordWrite(code, cell);
|
| }
|
|
|
|
|
|
|