1.1 --- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Tue Jun 01 11:48:33 2010 -0700 1.2 +++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Wed Jun 02 22:45:42 2010 -0700 1.3 @@ -3305,7 +3305,7 @@ 1.4 1.5 // Restore SP from BP if the exception PC is a MethodHandle call site. 1.6 __ cmpl(Address(r15_thread, JavaThread::is_method_handle_return_offset()), 0); 1.7 - __ cmovptr(Assembler::notEqual, rsp, rbp); 1.8 + __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save); 1.9 1.10 // We have a handler in rax (could be deopt blob). 1.11 __ mov(r8, rax);