src/cpu/x86/vm/methodHandles_x86.cpp

*** 166,177 ****
    // the following assumes that a Method* is normally compressed in the vmtarget field:
    __ movptr(method_temp, Address(method_temp, NONZERO(java_lang_invoke_MemberName::vmtarget_offset_in_bytes())));
  
    if (VerifyMethodHandles && !for_compiler_entry) {
      // make sure recv is already on stack
      __ load_sized_value(temp2,
!                         Address(method_temp, Method::size_of_parameters_offset()),
                          sizeof(u2), /*is_signed*/ false);
      // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), "");
      Label L;
      __ cmpptr(recv, __ argument_address(temp2, -1));
      __ jcc(Assembler::equal, L);
--- 166,178 ----
    // the following assumes that a Method* is normally compressed in the vmtarget field:
    __ movptr(method_temp, Address(method_temp, NONZERO(java_lang_invoke_MemberName::vmtarget_offset_in_bytes())));
  
    if (VerifyMethodHandles && !for_compiler_entry) {
      // make sure recv is already on stack
+     __ movptr(temp2, Address(method_temp, Method::const_offset()));
      __ load_sized_value(temp2,
!                         Address(temp2, ConstMethod::size_of_parameters_offset()),
                          sizeof(u2), /*is_signed*/ false);
      // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), "");
      Label L;
      __ cmpptr(recv, __ argument_address(temp2, -1));
      __ jcc(Assembler::equal, L);
*** 231,242 ****
    // First task:  Find out how big the argument list is.
    Address rdx_first_arg_addr;
    int ref_kind = signature_polymorphic_intrinsic_ref_kind(iid);
    assert(ref_kind != 0 || iid == vmIntrinsics::_invokeBasic, "must be _invokeBasic or a linkTo intrinsic");
    if (ref_kind == 0 || MethodHandles::ref_kind_has_receiver(ref_kind)) {
      __ load_sized_value(rdx_argp,
!                         Address(rbx_method, Method::size_of_parameters_offset()),
                          sizeof(u2), /*is_signed*/ false);
      // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), "");
      rdx_first_arg_addr = __ argument_address(rdx_argp, -1);
    } else {
      DEBUG_ONLY(rdx_argp = noreg);
--- 232,244 ----
    // First task:  Find out how big the argument list is.
    Address rdx_first_arg_addr;
    int ref_kind = signature_polymorphic_intrinsic_ref_kind(iid);
    assert(ref_kind != 0 || iid == vmIntrinsics::_invokeBasic, "must be _invokeBasic or a linkTo intrinsic");
    if (ref_kind == 0 || MethodHandles::ref_kind_has_receiver(ref_kind)) {
+     __ movptr(rdx_argp, Address(rbx_method, Method::const_offset()));
      __ load_sized_value(rdx_argp,
!                         Address(rdx_argp, ConstMethod::size_of_parameters_offset()),
                          sizeof(u2), /*is_signed*/ false);
      // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), "");
      rdx_first_arg_addr = __ argument_address(rdx_argp, -1);
    } else {
      DEBUG_ONLY(rdx_argp = noreg);