Index: src/compiler/mips64/code-generator-mips64.cc |
diff --git a/src/compiler/mips64/code-generator-mips64.cc b/src/compiler/mips64/code-generator-mips64.cc |
index db980458f0824a5ce9f000a26097d0a4340ae3ee..6c0ee1a020ac6e7644c0c0d360278e4bd0156791 100644 |
--- a/src/compiler/mips64/code-generator-mips64.cc |
+++ b/src/compiler/mips64/code-generator-mips64.cc |
@@ -466,9 +466,6 @@ void CodeGenerator::AssembleDeconstructActivationRecord(int stack_param_delta) { |
if (sp_slot_delta > 0) { |
__ daddiu(sp, sp, sp_slot_delta * kPointerSize); |
} |
- if (frame()->needs_frame()) { |
- __ Pop(ra, fp); |
- } |
frame_access_state()->SetFrameAccessToDefault(); |
} |
@@ -479,6 +476,10 @@ void CodeGenerator::AssemblePrepareTailCall(int stack_param_delta) { |
__ Dsubu(sp, sp, Operand(-sp_slot_delta * kPointerSize)); |
frame_access_state()->IncreaseSPDelta(-sp_slot_delta); |
} |
+ if (frame()->needs_frame()) { |
+ __ ld(ra, MemOperand(fp, StandardFrameConstants::kCallerPCOffset)); |
+ __ ld(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
+ } |
frame_access_state()->SetFrameAccessToSP(); |
} |