Index: src/compiler/arm64/code-generator-arm64.cc |
diff --git a/src/compiler/arm64/code-generator-arm64.cc b/src/compiler/arm64/code-generator-arm64.cc |
index c8c030129601d6c1230201de9462e19e45521387..7aab8cd86e7386291947a4674e308b68bbbf7390 100644 |
--- a/src/compiler/arm64/code-generator-arm64.cc |
+++ b/src/compiler/arm64/code-generator-arm64.cc |
@@ -464,9 +464,6 @@ void CodeGenerator::AssembleDeconstructActivationRecord(int stack_param_delta) { |
if (sp_slot_delta > 0) { |
__ Add(jssp, jssp, Operand(sp_slot_delta * kPointerSize)); |
} |
- if (frame()->needs_frame()) { |
- __ Pop(fp, lr); |
- } |
frame_access_state()->SetFrameAccessToDefault(); |
} |
@@ -477,6 +474,10 @@ void CodeGenerator::AssemblePrepareTailCall(int stack_param_delta) { |
__ Sub(jssp, jssp, Operand(-sp_slot_delta * kPointerSize)); |
frame_access_state()->IncreaseSPDelta(-sp_slot_delta); |
} |
+ if (frame()->needs_frame()) { |
+ __ Ldr(lr, MemOperand(fp, StandardFrameConstants::kCallerPCOffset)); |
+ __ Ldr(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
+ } |
frame_access_state()->SetFrameAccessToSP(); |
} |