Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/cpu/x86/vm/methodHandles_x86.cpp	Fri Dec 07 10:55:16 2012 -0800
     1.2 +++ b/src/cpu/x86/vm/methodHandles_x86.cpp	Tue Dec 11 12:41:31 2012 -0500
     1.3 @@ -169,8 +169,9 @@
     1.4  
     1.5    if (VerifyMethodHandles && !for_compiler_entry) {
     1.6      // make sure recv is already on stack
     1.7 +    __ movptr(temp2, Address(method_temp, Method::const_offset()));
     1.8      __ load_sized_value(temp2,
     1.9 -                        Address(method_temp, Method::size_of_parameters_offset()),
    1.10 +                        Address(temp2, ConstMethod::size_of_parameters_offset()),
    1.11                          sizeof(u2), /*is_signed*/ false);
    1.12      // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), "");
    1.13      Label L;
    1.14 @@ -234,8 +235,9 @@
    1.15    int ref_kind = signature_polymorphic_intrinsic_ref_kind(iid);
    1.16    assert(ref_kind != 0 || iid == vmIntrinsics::_invokeBasic, "must be _invokeBasic or a linkTo intrinsic");
    1.17    if (ref_kind == 0 || MethodHandles::ref_kind_has_receiver(ref_kind)) {
    1.18 +    __ movptr(rdx_argp, Address(rbx_method, Method::const_offset()));
    1.19      __ load_sized_value(rdx_argp,
    1.20 -                        Address(rbx_method, Method::size_of_parameters_offset()),
    1.21 +                        Address(rdx_argp, ConstMethod::size_of_parameters_offset()),
    1.22                          sizeof(u2), /*is_signed*/ false);
    1.23      // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), "");
    1.24      rdx_first_arg_addr = __ argument_address(rdx_argp, -1);