| Index: src/x64/assembler-x64-inl.h
|
| diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h
|
| index 17376581b5fee2f727214d08bdf87693b7b92ed5..0d81db0b32c392c0745fe6ce0876024400d10ee6 100644
|
| --- a/src/x64/assembler-x64-inl.h
|
| +++ b/src/x64/assembler-x64-inl.h
|
| @@ -404,7 +404,7 @@ void RelocInfo::set_target_object(Object* target,
|
| DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| Memory::Object_at(pc_) = target;
|
| if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
|
| - Assembler::FlushICacheWithoutIsolate(pc_, sizeof(Address));
|
| + Assembler::FlushICache(isolate_, pc_, sizeof(Address));
|
| }
|
| if (write_barrier_mode == UPDATE_WRITE_BARRIER &&
|
| host() != NULL &&
|
| @@ -451,7 +451,7 @@ void RelocInfo::set_target_cell(Cell* cell,
|
| Address address = cell->address() + Cell::kValueOffset;
|
| Memory::Address_at(pc_) = address;
|
| if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
|
| - Assembler::FlushICacheWithoutIsolate(pc_, sizeof(Address));
|
| + Assembler::FlushICache(isolate_, pc_, sizeof(Address));
|
| }
|
| if (write_barrier_mode == UPDATE_WRITE_BARRIER &&
|
| host() != NULL) {
|
| @@ -527,8 +527,9 @@ void RelocInfo::set_debug_call_address(Address target) {
|
| DCHECK(IsDebugBreakSlot(rmode()) && IsPatchedDebugBreakSlotSequence());
|
| Memory::Address_at(pc_ + Assembler::kPatchDebugBreakSlotAddressOffset) =
|
| target;
|
| - Assembler::FlushICacheWithoutIsolate(
|
| - pc_ + Assembler::kPatchDebugBreakSlotAddressOffset, sizeof(Address));
|
| + Assembler::FlushICache(isolate_,
|
| + pc_ + Assembler::kPatchDebugBreakSlotAddressOffset,
|
| + sizeof(Address));
|
| if (host() != NULL) {
|
| Object* target_code = Code::GetCodeFromTargetAddress(target);
|
| host()->GetHeap()->incremental_marking()->RecordWriteIntoCode(
|
| @@ -541,7 +542,7 @@ void RelocInfo::Visit(Isolate* isolate, ObjectVisitor* visitor) {
|
| RelocInfo::Mode mode = rmode();
|
| if (mode == RelocInfo::EMBEDDED_OBJECT) {
|
| visitor->VisitEmbeddedPointer(this);
|
| - Assembler::FlushICacheWithoutIsolate(pc_, sizeof(Address));
|
| + Assembler::FlushICache(isolate, pc_, sizeof(Address));
|
| } else if (RelocInfo::IsCodeTarget(mode)) {
|
| visitor->VisitCodeTarget(this);
|
| } else if (mode == RelocInfo::CELL) {
|
|
|