Index: src/arm/codegen-arm.cc |
=================================================================== |
--- src/arm/codegen-arm.cc (revision 5841) |
+++ src/arm/codegen-arm.cc (working copy) |
@@ -1892,18 +1892,15 @@ |
frame_->SpillAll(); |
Comment cmnt(masm_, "[ check stack"); |
__ LoadRoot(ip, Heap::kStackLimitRootIndex); |
- // Put the lr setup instruction in the delay slot. kInstrSize is added to |
- // the implicit 8 byte offset that always applies to operations with pc and |
- // gives a return address 12 bytes down. |
- masm_->add(lr, pc, Operand(Assembler::kInstrSize)); |
masm_->cmp(sp, Operand(ip)); |
StackCheckStub stub; |
// Call the stub if lower. |
- masm_->mov(pc, |
+ masm_->mov(ip, |
Operand(reinterpret_cast<intptr_t>(stub.GetCode().location()), |
RelocInfo::CODE_TARGET), |
LeaveCC, |
lo); |
+ masm_->Call(ip, lo); |
} |