| Index: src/arm64/assembler-arm64-inl.h
 | 
| diff --git a/src/arm64/assembler-arm64-inl.h b/src/arm64/assembler-arm64-inl.h
 | 
| index de7e71df7322344d9af8211726ffeff6dcf7a5d4..f6bb6a88939effb3934837a2a326e0af30652650 100644
 | 
| --- a/src/arm64/assembler-arm64-inl.h
 | 
| +++ b/src/arm64/assembler-arm64-inl.h
 | 
| @@ -707,7 +707,7 @@ void RelocInfo::set_target_object(HeapObject* target,
 | 
|                                    WriteBarrierMode write_barrier_mode,
 | 
|                                    ICacheFlushMode icache_flush_mode) {
 | 
|    DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
 | 
| -  Assembler::set_target_address_at(isolate_, pc_, host_,
 | 
| +  Assembler::set_target_address_at(target->GetIsolate(), pc_, host_,
 | 
|                                     reinterpret_cast<Address>(target),
 | 
|                                     icache_flush_mode);
 | 
|    if (write_barrier_mode == UPDATE_WRITE_BARRIER && host() != NULL) {
 | 
| @@ -741,13 +741,12 @@ Address RelocInfo::target_runtime_entry(Assembler* origin) {
 | 
|    return target_address();
 | 
|  }
 | 
|  
 | 
| -
 | 
| -void RelocInfo::set_target_runtime_entry(Address target,
 | 
| +void RelocInfo::set_target_runtime_entry(Isolate* isolate, Address target,
 | 
|                                           WriteBarrierMode write_barrier_mode,
 | 
|                                           ICacheFlushMode icache_flush_mode) {
 | 
|    DCHECK(IsRuntimeEntry(rmode_));
 | 
|    if (target_address() != target) {
 | 
| -    set_target_address(target, write_barrier_mode, icache_flush_mode);
 | 
| +    set_target_address(isolate, target, write_barrier_mode, icache_flush_mode);
 | 
|    }
 | 
|  }
 | 
|  
 | 
| @@ -807,11 +806,10 @@ Address RelocInfo::debug_call_address() {
 | 
|    return Assembler::target_address_at(pc_, host_);
 | 
|  }
 | 
|  
 | 
| -
 | 
| -void RelocInfo::set_debug_call_address(Address target) {
 | 
| +void RelocInfo::set_debug_call_address(Isolate* isolate, Address target) {
 | 
|    DCHECK(IsDebugBreakSlot(rmode()) && IsPatchedDebugBreakSlotSequence());
 | 
|    STATIC_ASSERT(Assembler::kPatchDebugBreakSlotAddressOffset == 0);
 | 
| -  Assembler::set_target_address_at(isolate_, pc_, host_, target);
 | 
| +  Assembler::set_target_address_at(isolate, pc_, host_, target);
 | 
|    if (host() != NULL) {
 | 
|      Code* target_code = Code::GetCodeFromTargetAddress(target);
 | 
|      host()->GetHeap()->incremental_marking()->RecordWriteIntoCode(host(), this,
 | 
| @@ -819,15 +817,14 @@ void RelocInfo::set_debug_call_address(Address target) {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| -
 | 
| -void RelocInfo::WipeOut() {
 | 
| +void RelocInfo::WipeOut(Isolate* isolate) {
 | 
|    DCHECK(IsEmbeddedObject(rmode_) || IsCodeTarget(rmode_) ||
 | 
|           IsRuntimeEntry(rmode_) || IsExternalReference(rmode_) ||
 | 
|           IsInternalReference(rmode_));
 | 
|    if (IsInternalReference(rmode_)) {
 | 
|      Memory::Address_at(pc_) = NULL;
 | 
|    } else {
 | 
| -    Assembler::set_target_address_at(isolate_, pc_, host_, NULL);
 | 
| +    Assembler::set_target_address_at(isolate, pc_, host_, NULL);
 | 
|    }
 | 
|  }
 | 
|  
 | 
| 
 |