| Index: src/arm/deoptimizer-arm.cc
|
| diff --git a/src/arm/deoptimizer-arm.cc b/src/arm/deoptimizer-arm.cc
|
| index 43f2fb34637ede2f5bc68ca1add6ba90c728517a..38635ea3cf9380578bb0555b67c66107e2ff63c1 100644
|
| --- a/src/arm/deoptimizer-arm.cc
|
| +++ b/src/arm/deoptimizer-arm.cc
|
| @@ -40,14 +40,15 @@ void Deoptimizer::PatchCodeForDeoptimization(Isolate* isolate, Code* code) {
|
| } else {
|
| pointer = code->instruction_start();
|
| }
|
| - CodePatcher patcher(pointer, 1);
|
| + CodePatcher patcher(isolate, pointer, 1);
|
| patcher.masm()->bkpt(0);
|
|
|
| DeoptimizationInputData* data =
|
| DeoptimizationInputData::cast(code->deoptimization_data());
|
| int osr_offset = data->OsrPcOffset()->value();
|
| if (osr_offset > 0) {
|
| - CodePatcher osr_patcher(code->instruction_start() + osr_offset, 1);
|
| + CodePatcher osr_patcher(isolate, code->instruction_start() + osr_offset,
|
| + 1);
|
| osr_patcher.masm()->bkpt(0);
|
| }
|
| }
|
| @@ -72,7 +73,7 @@ void Deoptimizer::PatchCodeForDeoptimization(Isolate* isolate, Code* code) {
|
| int call_size_in_words = call_size_in_bytes / Assembler::kInstrSize;
|
| DCHECK(call_size_in_bytes % Assembler::kInstrSize == 0);
|
| DCHECK(call_size_in_bytes <= patch_size());
|
| - CodePatcher patcher(call_address, call_size_in_words);
|
| + CodePatcher patcher(isolate, call_address, call_size_in_words);
|
| patcher.masm()->Call(deopt_entry, RelocInfo::NONE32);
|
| DCHECK(prev_call_address == NULL ||
|
| call_address >= prev_call_address + patch_size());
|
|
|