| Index: src/arm/deoptimizer-arm.cc
|
| diff --git a/src/arm/deoptimizer-arm.cc b/src/arm/deoptimizer-arm.cc
|
| index 84acba287340bcb1b79b8f555939251099fbb518..dbce3feeba745c12173be399109dc316bb0fba81 100644
|
| --- a/src/arm/deoptimizer-arm.cc
|
| +++ b/src/arm/deoptimizer-arm.cc
|
| @@ -131,13 +131,8 @@ void Deoptimizer::PatchStackCheckCodeAt(Code* unoptimized_code,
|
| ASSERT(Memory::int32_at(pc_after - kInstrSize) == kBlxIp);
|
| ASSERT(Assembler::IsLdrPcImmediateOffset(
|
| Assembler::instr_at(pc_after - 2 * kInstrSize)));
|
| - if (FLAG_count_based_interrupts) {
|
| - ASSERT_EQ(kBranchBeforeInterrupt,
|
| - Memory::int32_at(pc_after - 3 * kInstrSize));
|
| - } else {
|
| - ASSERT_EQ(kBranchBeforeStackCheck,
|
| - Memory::int32_at(pc_after - 3 * kInstrSize));
|
| - }
|
| + ASSERT_EQ(kBranchBeforeInterrupt,
|
| + Memory::int32_at(pc_after - 3 * kInstrSize));
|
|
|
| // We patch the code to the following form:
|
| // e1 5d 00 0c cmp sp, <limit>
|
| @@ -177,15 +172,9 @@ void Deoptimizer::RevertStackCheckCodeAt(Code* unoptimized_code,
|
|
|
| // Replace NOP with conditional jump.
|
| CodePatcher patcher(pc_after - 3 * kInstrSize, 1);
|
| - if (FLAG_count_based_interrupts) {
|
| - patcher.masm()->b(+16, pl);
|
| - ASSERT_EQ(kBranchBeforeInterrupt,
|
| - Memory::int32_at(pc_after - 3 * kInstrSize));
|
| - } else {
|
| - patcher.masm()->b(+4, cs);
|
| - ASSERT_EQ(kBranchBeforeStackCheck,
|
| - Memory::int32_at(pc_after - 3 * kInstrSize));
|
| - }
|
| + patcher.masm()->b(+16, pl);
|
| + ASSERT_EQ(kBranchBeforeInterrupt,
|
| + Memory::int32_at(pc_after - 3 * kInstrSize));
|
|
|
| // Replace the stack check address in the constant pool
|
| // with the entry address of the replacement code.
|
|
|