src/cpu/x86/vm/c1_Runtime1_x86.cpp

*** 780,790 ****
    __ pop(exception_pc);
  
    // 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);
  
    // continue at exception handler (return address removed)
    // note: do *not* remove arguments when unwinding the
    //       activation since the caller assumes having
    //       all arguments on the stack when entering the
--- 780,790 ----
    __ pop(exception_pc);
  
    // 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_mh_SP_save);
  
    // continue at exception handler (return address removed)
    // note: do *not* remove arguments when unwinding the
    //       activation since the caller assumes having
    //       all arguments on the stack when entering the