src/cpu/x86/vm/methodHandles_x86.cpp

*** 417,426 ****
--- 417,427 ----
  
    guarantee(java_dyn_MethodHandle::vmentry_offset_in_bytes() != 0, "must have offsets");
  
    // some handy addresses
    Address rbx_method_fie(     rbx,      methodOopDesc::from_interpreted_offset() );
+   Address rbx_method_fce(     rbx,      methodOopDesc::from_compiled_offset() );
  
    Address rcx_mh_vmtarget(    rcx_recv, java_dyn_MethodHandle::vmtarget_offset_in_bytes() );
    Address rcx_dmh_vmindex(    rcx_recv, sun_dyn_DirectMethodHandle::vmindex_offset_in_bytes() );
  
    Address rcx_bmh_vmargslot(  rcx_recv, sun_dyn_BoundMethodHandle::vmargslot_offset_in_bytes() );
*** 446,461 ****
  
    switch ((int) ek) {
    case _raise_exception:
      {
        // Not a real MH entry, but rather shared code for raising an
!       // exception.  Since we use a C2I adapter to set up the
!       // interpreter state, arguments are expected in compiler
!       // argument registers.
        assert(raise_exception_method(), "must be set");
!       address c2i_entry = raise_exception_method()->get_c2i_entry();
!       assert(c2i_entry, "method must be linked");
  
        const Register rdi_pc = rax;
        __ pop(rdi_pc);  // caller PC
        __ mov(rsp, saved_last_sp);  // cut the stack back to where the caller started
  
--- 447,460 ----
  
    switch ((int) ek) {
    case _raise_exception:
      {
        // Not a real MH entry, but rather shared code for raising an
!       // exception.  Since we use the compiled entry, arguments are
!       // expected in compiler argument registers.
        assert(raise_exception_method(), "must be set");
!       assert(raise_exception_method()->from_compiled_entry(), "method must be linked");
  
        const Register rdi_pc = rax;
        __ pop(rdi_pc);  // caller PC
        __ mov(rsp, saved_last_sp);  // cut the stack back to where the caller started
  
*** 470,486 ****
        __ movptr(rbx_method, Address(rbx_method, jobject_oop_offset));  // dereference the jobject
        __ testptr(rbx_method, rbx_method);
        __ jccb(Assembler::zero, L_no_method);
        __ verify_oop(rbx_method);
  
-       // 32-bit: push remaining arguments as if coming from the compiler.
        NOT_LP64(__ push(rarg2_required));
- 
        __ push(rdi_pc);  // restore caller PC
!       __ jump(ExternalAddress(c2i_entry));  // do C2I transition
  
-       // If we get here, the Java runtime did not do its job of creating the exception.
        // Do something that is at least causes a valid throw from the interpreter.
        __ bind(L_no_method);
        __ push(rarg2_required);
        __ push(rarg1_actual);
        __ jump(ExternalAddress(Interpreter::throw_WrongMethodType_entry()));
--- 469,482 ----
        __ movptr(rbx_method, Address(rbx_method, jobject_oop_offset));  // dereference the jobject
        __ testptr(rbx_method, rbx_method);
        __ jccb(Assembler::zero, L_no_method);
        __ verify_oop(rbx_method);
  
        NOT_LP64(__ push(rarg2_required));
        __ push(rdi_pc);         // restore caller PC
!       __ jmp(rbx_method_fce);  // jump to compiled entry
  
        // Do something that is at least causes a valid throw from the interpreter.
        __ bind(L_no_method);
        __ push(rarg2_required);
        __ push(rarg1_actual);
        __ jump(ExternalAddress(Interpreter::throw_WrongMethodType_entry()));