Index: src/full-codegen/arm64/full-codegen-arm64.cc |
diff --git a/src/full-codegen/arm64/full-codegen-arm64.cc b/src/full-codegen/arm64/full-codegen-arm64.cc |
index d345ecf0868a886cf008d7245ea64dc639d26cd2..b49a74ea9bed3587d739bbde01d15920220fca7d 100644 |
--- a/src/full-codegen/arm64/full-codegen-arm64.cc |
+++ b/src/full-codegen/arm64/full-codegen-arm64.cc |
@@ -4915,7 +4915,8 @@ void BackEdgeTable::PatchAt(Code* unoptimized_code, |
Code* replacement_code) { |
// Turn the jump into a nop. |
Address branch_address = pc - 3 * kInstructionSize; |
- PatchingAssembler patcher(unoptimized_code->GetIsolate(), branch_address, 1); |
+ Isolate* isolate = unoptimized_code->GetIsolate(); |
+ PatchingAssembler patcher(isolate, branch_address, 1); |
DCHECK(Instruction::Cast(branch_address) |
->IsNop(Assembler::INTERRUPT_CODE_NOP) || |
@@ -4949,25 +4950,17 @@ void BackEdgeTable::PatchAt(Code* unoptimized_code, |
Address interrupt_address_pointer = |
reinterpret_cast<Address>(load) + load->ImmPCOffset(); |
DCHECK((Memory::uint64_at(interrupt_address_pointer) == |
- reinterpret_cast<uint64_t>(unoptimized_code->GetIsolate() |
- ->builtins() |
- ->OnStackReplacement() |
- ->entry())) || |
+ reinterpret_cast<uint64_t>( |
+ isolate->builtins()->OnStackReplacement()->entry())) || |
(Memory::uint64_at(interrupt_address_pointer) == |
- reinterpret_cast<uint64_t>(unoptimized_code->GetIsolate() |
- ->builtins() |
- ->InterruptCheck() |
- ->entry())) || |
+ reinterpret_cast<uint64_t>( |
+ isolate->builtins()->InterruptCheck()->entry())) || |
(Memory::uint64_at(interrupt_address_pointer) == |
- reinterpret_cast<uint64_t>(unoptimized_code->GetIsolate() |
- ->builtins() |
- ->OsrAfterStackCheck() |
- ->entry())) || |
+ reinterpret_cast<uint64_t>( |
+ isolate->builtins()->OsrAfterStackCheck()->entry())) || |
(Memory::uint64_at(interrupt_address_pointer) == |
- reinterpret_cast<uint64_t>(unoptimized_code->GetIsolate() |
- ->builtins() |
- ->OnStackReplacement() |
- ->entry()))); |
+ reinterpret_cast<uint64_t>( |
+ isolate->builtins()->OnStackReplacement()->entry()))); |
Memory::uint64_at(interrupt_address_pointer) = |
reinterpret_cast<uint64_t>(replacement_code->entry()); |