Mercurial > hg > truffle

diff src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 1579:e9ff18c4ace7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jrose
date Wed, 02 Jun 2010 22:45:42 -0700
parents c18cbe5936b8 110501f54a99
children f95d63e2154a
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Tue Jun 01 11:48:33 2010 -0700
+++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Wed Jun 02 22:45:42 2010 -0700
@@ -3305,7 +3305,7 @@
 
   // Restore SP from BP if the exception PC is a MethodHandle call site.
   __ cmpl(Address(r15_thread, JavaThread::is_method_handle_return_offset()), 0);
-  __ cmovptr(Assembler::notEqual, rsp, rbp);
+  __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save);
 
   // We have a handler in rax (could be deopt blob).
   __ mov(r8, rax);