1.1 --- a/src/cpu/x86/vm/runtime_x86_32.cpp Mon May 24 14:15:14 2010 -0700 1.2 +++ b/src/cpu/x86/vm/runtime_x86_32.cpp Tue May 25 02:38:48 2010 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved. 1.6 + * Copyright 1998-2010 Sun Microsystems, Inc. All Rights Reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -117,7 +117,7 @@ 1.11 1.12 // Restore SP from BP if the exception PC is a MethodHandle call site. 1.13 __ cmpl(Address(rcx, JavaThread::is_method_handle_return_offset()), 0); 1.14 - __ cmovptr(Assembler::notEqual, rsp, rbp); 1.15 + __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save); 1.16 1.17 // We have a handler in rax, (could be deopt blob) 1.18 // rdx - throwing pc, deopt blob will need it.