| Index: src/arm/deoptimizer-arm.cc
|
| ===================================================================
|
| --- src/arm/deoptimizer-arm.cc (revision 9676)
|
| +++ src/arm/deoptimizer-arm.cc (working copy)
|
| @@ -100,7 +100,6 @@
|
| }
|
| }
|
|
|
| -
|
| #ifdef DEBUG
|
| // Destroy the code which is not supposed to be run again.
|
| int instructions =
|
| @@ -178,16 +177,13 @@
|
| Memory::uint32_at(stack_check_address_pointer) =
|
| reinterpret_cast<uint32_t>(replacement_code->entry());
|
|
|
| - RelocInfo rinfo(pc_after - 2 * kInstrSize,
|
| - RelocInfo::CODE_TARGET,
|
| - 0,
|
| - unoptimized_code);
|
| - unoptimized_code->GetHeap()->incremental_marking()->RecordWriteIntoCode(
|
| - unoptimized_code, &rinfo, replacement_code);
|
| + unoptimized_code->GetHeap()->incremental_marking()->RecordCodeTargetPatch(
|
| + unoptimized_code, pc_after - 2 * kInstrSize, replacement_code);
|
| }
|
|
|
|
|
| -void Deoptimizer::RevertStackCheckCodeAt(Address pc_after,
|
| +void Deoptimizer::RevertStackCheckCodeAt(Code* unoptimized_code,
|
| + Address pc_after,
|
| Code* check_code,
|
| Code* replacement_code) {
|
| const int kInstrSize = Assembler::kInstrSize;
|
| @@ -209,8 +205,8 @@
|
| Memory::uint32_at(stack_check_address_pointer) =
|
| reinterpret_cast<uint32_t>(check_code->entry());
|
|
|
| - check_code->GetHeap()->incremental_marking()->
|
| - RecordCodeTargetPatch(pc_after - 2 * kInstrSize, check_code);
|
| + check_code->GetHeap()->incremental_marking()->RecordCodeTargetPatch(
|
| + unoptimized_code, pc_after - 2 * kInstrSize, check_code);
|
| }
|
|
|
|
|
| @@ -727,7 +723,6 @@
|
| __ ldr(r3, MemOperand(r2, FrameDescription::frame_size_offset()));
|
| __ bind(&inner_push_loop);
|
| __ sub(r3, r3, Operand(sizeof(uint32_t)));
|
| - // __ add(r6, r2, Operand(r3, LSL, 1));
|
| __ add(r6, r2, Operand(r3));
|
| __ ldr(r7, MemOperand(r6, FrameDescription::frame_content_offset()));
|
| __ push(r7);
|
|
|