| Index: src/mips64/assembler-mips64-inl.h
|
| diff --git a/src/mips64/assembler-mips64-inl.h b/src/mips64/assembler-mips64-inl.h
|
| index ec999953063419dc9e2eb2c5f9ff7da6ac1187e7..a824ee7fc13c7d38a63a40dd079319c960498e9b 100644
|
| --- a/src/mips64/assembler-mips64-inl.h
|
| +++ b/src/mips64/assembler-mips64-inl.h
|
| @@ -144,7 +144,8 @@ void RelocInfo::set_target_address(Address target,
|
| WriteBarrierMode write_barrier_mode,
|
| ICacheFlushMode icache_flush_mode) {
|
| DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
|
| - Assembler::set_target_address_at(pc_, host_, target, icache_flush_mode);
|
| + Assembler::set_target_address_at(isolate_, pc_, host_, target,
|
| + icache_flush_mode);
|
| if (write_barrier_mode == UPDATE_WRITE_BARRIER &&
|
| host() != NULL && IsCodeTarget(rmode_)) {
|
| Object* target_code = Code::GetCodeFromTargetAddress(target);
|
| @@ -178,7 +179,7 @@ void Assembler::set_target_internal_reference_encoded_at(Address pc,
|
|
|
|
|
| void Assembler::deserialization_set_target_internal_reference_at(
|
| - Address pc, Address target, RelocInfo::Mode mode) {
|
| + Isolate* isolate, Address pc, Address target, RelocInfo::Mode mode) {
|
| if (mode == RelocInfo::INTERNAL_REFERENCE_ENCODED) {
|
| DCHECK(IsJ(instr_at(pc)));
|
| set_target_internal_reference_encoded_at(pc, target);
|
| @@ -206,7 +207,7 @@ void RelocInfo::set_target_object(Object* target,
|
| WriteBarrierMode write_barrier_mode,
|
| ICacheFlushMode icache_flush_mode) {
|
| DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| - Assembler::set_target_address_at(pc_, host_,
|
| + Assembler::set_target_address_at(isolate_, pc_, host_,
|
| reinterpret_cast<Address>(target),
|
| icache_flush_mode);
|
| if (write_barrier_mode == UPDATE_WRITE_BARRIER &&
|
| @@ -308,8 +309,7 @@ Code* RelocInfo::code_age_stub() {
|
| void RelocInfo::set_code_age_stub(Code* stub,
|
| ICacheFlushMode icache_flush_mode) {
|
| DCHECK(rmode_ == RelocInfo::CODE_AGE_SEQUENCE);
|
| - Assembler::set_target_address_at(pc_ + Assembler::kInstrSize,
|
| - host_,
|
| + Assembler::set_target_address_at(isolate_, pc_ + Assembler::kInstrSize, host_,
|
| stub->instruction_start());
|
| }
|
|
|
| @@ -326,7 +326,7 @@ void RelocInfo::set_debug_call_address(Address target) {
|
| DCHECK(IsDebugBreakSlot(rmode()) && IsPatchedDebugBreakSlotSequence());
|
| // The pc_ offset of 0 assumes patched debug break slot or return
|
| // sequence.
|
| - Assembler::set_target_address_at(pc_, host_, target);
|
| + Assembler::set_target_address_at(isolate_, pc_, host_, target);
|
| if (host() != NULL) {
|
| Object* target_code = Code::GetCodeFromTargetAddress(target);
|
| host()->GetHeap()->incremental_marking()->RecordWriteIntoCode(
|
| @@ -344,7 +344,7 @@ void RelocInfo::WipeOut() {
|
| } else if (IsInternalReferenceEncoded(rmode_)) {
|
| Assembler::set_target_internal_reference_encoded_at(pc_, nullptr);
|
| } else {
|
| - Assembler::set_target_address_at(pc_, host_, NULL);
|
| + Assembler::set_target_address_at(isolate_, pc_, host_, NULL);
|
| }
|
| }
|
|
|
|
|