Index: src/arm64/builtins-arm64.cc |
diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc |
index 2539b4369e8390ec92b2bff14e2128b3db9a9518..2b372235fbab75b2866243215336be6bda4a8630 100644 |
--- a/src/arm64/builtins-arm64.cc |
+++ b/src/arm64/builtins-arm64.cc |
@@ -1025,9 +1025,11 @@ void Builtins::Generate_InterpreterExitTrampoline(MacroAssembler* masm) { |
// Leave the frame (also dropping the register file). |
__ LeaveFrame(StackFrame::JAVA_SCRIPT); |
- // Drop receiver + arguments. |
- // TODO(rmcilroy): Get number of arguments from BytecodeArray. |
- __ Drop(1, kXRegSize); |
+ |
+ // Drop receiver + arguments and return. |
+ __ Ldr(w1, FieldMemOperand(kInterpreterBytecodeArrayRegister, |
+ BytecodeArray::kParameterSizeOffset)); |
+ __ Drop(x1); |
Michael Starzinger
2015/08/26 13:44:36
Not sure but isn't the ARM64 macro assembler expec
rmcilroy
2015/08/27 09:54:39
Yes, good catch thanks!
|
__ Ret(); |
} |