1.1 --- a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Mon Jun 19 22:49:52 2017 +0000
1.2 +++ b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Mon Jun 26 02:04:40 2017 -0700
1.3 @@ -1262,7 +1262,7 @@
1.4 __ movl(Address(r15_thread, JavaThread::thread_state_offset()), _thread_in_Java);
1.5
1.6 // reset_last_Java_frame
1.7 - __ reset_last_Java_frame(true, true);
1.8 + __ reset_last_Java_frame(r15_thread, true);
1.9
1.10 // reset handle block
1.11 __ movptr(t, Address(r15_thread, JavaThread::active_handles_offset()));
1.12 @@ -1837,7 +1837,7 @@
1.13 // PC must point into interpreter here
1.14 __ set_last_Java_frame(noreg, rbp, __ pc());
1.15 __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::popframe_move_outgoing_args), r15_thread, c_rarg1, c_rarg2);
1.16 - __ reset_last_Java_frame(true, true);
1.17 + __ reset_last_Java_frame(r15_thread, true);
1.18 // Restore the last_sp and null it out
1.19 __ movptr(rsp, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
1.20 __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
