Mercurial > hg > truffle
diff src/cpu/x86/vm/runtime_x86_32.cpp @ 1368:93767e6a2dfd
6941529: SharedRuntime::raw_exception_handler_for_return_address must reset thread MethodHandle flag
Summary: During testing a bug was hit when an exception returned to the interpreter and the SP was wrong.
Reviewed-by: kvn, never
author | twisti |
---|---|
date | Thu, 08 Apr 2010 10:55:40 +0200 |
parents | e66fd840cb6b |
children | c18cbe5936b8 110501f54a99 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/runtime_x86_32.cpp Wed Apr 07 12:39:27 2010 -0700 +++ b/src/cpu/x86/vm/runtime_x86_32.cpp Thu Apr 08 10:55:40 2010 +0200 @@ -115,8 +115,8 @@ // rax: exception handler for given <exception oop/exception pc> - // Restore SP from BP if the exception PC is a MethodHandle call. - __ cmpl(Address(rcx, JavaThread::is_method_handle_exception_offset()), 0); + // Restore SP from BP if the exception PC is a MethodHandle call site. + __ cmpl(Address(rcx, JavaThread::is_method_handle_return_offset()), 0); __ cmovptr(Assembler::notEqual, rsp, rbp); // We have a handler in rax, (could be deopt blob)