Index: src/compiler/arm/code-generator-arm.cc |
diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc |
index fd593efbd2310bab2efeca1bfa44dd44043d71a3..8fc4ac8cffc75125c9847e559a19f01554bc5e59 100644 |
--- a/src/compiler/arm/code-generator-arm.cc |
+++ b/src/compiler/arm/code-generator-arm.cc |
@@ -359,13 +359,6 @@ void CodeGenerator::AssembleDeconstructActivationRecord(int stack_param_delta) { |
if (sp_slot_delta > 0) { |
__ add(sp, sp, Operand(sp_slot_delta * kPointerSize)); |
} |
- if (frame()->needs_frame()) { |
- if (FLAG_enable_embedded_constant_pool) { |
- __ ldm(ia_w, sp, pp.bit() | fp.bit() | lr.bit()); |
- } else { |
- __ ldm(ia_w, sp, fp.bit() | lr.bit()); |
- } |
- } |
frame_access_state()->SetFrameAccessToDefault(); |
} |
@@ -376,6 +369,13 @@ void CodeGenerator::AssemblePrepareTailCall(int stack_param_delta) { |
__ sub(sp, sp, Operand(-sp_slot_delta * kPointerSize)); |
frame_access_state()->IncreaseSPDelta(-sp_slot_delta); |
} |
+ if (frame()->needs_frame()) { |
+ if (FLAG_enable_embedded_constant_pool) { |
+ __ ldr(cp, MemOperand(fp, StandardFrameConstants::kConstantPoolOffset)); |
+ } |
+ __ ldr(lr, MemOperand(fp, StandardFrameConstants::kCallerPCOffset)); |
+ __ ldr(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
+ } |
frame_access_state()->SetFrameAccessToSP(); |
} |