--- old/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2010-04-26 03:24:10.957328216 -0700
+++ new/src/cpu/x86/vm/c1_Runtime1_x86.cpp	2010-04-26 03:24:10.580997209 -0700
@@ -782,7 +782,7 @@
   // Restore SP from BP if the exception PC is a MethodHandle call site.
   NOT_LP64(__ get_thread(thread);)
   __ cmpl(Address(thread, JavaThread::is_method_handle_return_offset()), 0);
-  __ cmovptr(Assembler::notEqual, rsp, rbp);
+  __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save);
 
   // continue at exception handler (return address removed)
   // note: do *not* remove arguments when unwinding the