| Index: src/arm64/assembler-arm64-inl.h
|
| diff --git a/src/arm64/assembler-arm64-inl.h b/src/arm64/assembler-arm64-inl.h
|
| index 5b735775db2c15e50f0566b38e566da726dded6f..d7769791ef91889074570aef39b22713fb93bf7e 100644
|
| --- a/src/arm64/assembler-arm64-inl.h
|
| +++ b/src/arm64/assembler-arm64-inl.h
|
| @@ -31,7 +31,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);
|
| @@ -648,19 +649,19 @@ Address Assembler::return_address_from_call_start(Address pc) {
|
|
|
|
|
| void Assembler::deserialization_set_special_target_at(
|
| - Address constant_pool_entry, Code* code, Address target) {
|
| + Isolate* isolate, Address constant_pool_entry, Code* code, Address target) {
|
| Memory::Address_at(constant_pool_entry) = target;
|
| }
|
|
|
|
|
| void Assembler::deserialization_set_target_internal_reference_at(
|
| - Address pc, Address target, RelocInfo::Mode mode) {
|
| + Isolate* isolate, Address pc, Address target, RelocInfo::Mode mode) {
|
| Memory::Address_at(pc) = target;
|
| }
|
|
|
|
|
| -void Assembler::set_target_address_at(Address pc, Address constant_pool,
|
| - Address target,
|
| +void Assembler::set_target_address_at(Isolate* isolate, Address pc,
|
| + Address constant_pool, Address target,
|
| ICacheFlushMode icache_flush_mode) {
|
| Memory::Address_at(target_pointer_address_at(pc)) = target;
|
| // Intuitively, we would think it is necessary to always flush the
|
| @@ -674,12 +675,11 @@ void Assembler::set_target_address_at(Address pc, Address constant_pool,
|
| }
|
|
|
|
|
| -void Assembler::set_target_address_at(Address pc,
|
| - Code* code,
|
| +void Assembler::set_target_address_at(Isolate* isolate, Address pc, Code* code,
|
| Address target,
|
| ICacheFlushMode icache_flush_mode) {
|
| Address constant_pool = code ? code->constant_pool() : NULL;
|
| - set_target_address_at(pc, constant_pool, target, icache_flush_mode);
|
| + set_target_address_at(isolate, pc, constant_pool, target, icache_flush_mode);
|
| }
|
|
|
|
|
| @@ -725,7 +725,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 &&
|
| @@ -832,7 +832,7 @@ Address RelocInfo::debug_call_address() {
|
| void RelocInfo::set_debug_call_address(Address target) {
|
| DCHECK(IsDebugBreakSlot(rmode()) && IsPatchedDebugBreakSlotSequence());
|
| STATIC_ASSERT(Assembler::kPatchDebugBreakSlotAddressOffset == 0);
|
| - 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(
|
| @@ -848,7 +848,7 @@ void RelocInfo::WipeOut() {
|
| if (IsInternalReference(rmode_)) {
|
| Memory::Address_at(pc_) = NULL;
|
| } else {
|
| - Assembler::set_target_address_at(pc_, host_, NULL);
|
| + Assembler::set_target_address_at(isolate_, pc_, host_, NULL);
|
| }
|
| }
|
|
|
|
|