Mercurial > hg > truffle

diff src/cpu/x86/vm/methodHandles_x86.cpp @ 7458:4daebd4cc1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author minqi
date Mon, 24 Dec 2012 11:46:38 -0800
parents fd74228fd5ca
children cc32ccaaf47f
line wrap: on
line diff
--- a/src/cpu/x86/vm/methodHandles_x86.cpp	Thu Dec 20 10:22:19 2012 +0100
+++ b/src/cpu/x86/vm/methodHandles_x86.cpp	Mon Dec 24 11:46:38 2012 -0800
@@ -169,8 +169,9 @@
 
   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(method_temp, Method::size_of_parameters_offset()),
+                        Address(temp2, ConstMethod::size_of_parameters_offset()),
                         sizeof(u2), /*is_signed*/ false);
     // assert(sizeof(u2) == sizeof(Method::_size_of_parameters), "");
     Label L;
@@ -234,8 +235,9 @@
   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(rbx_method, Method::size_of_parameters_offset()),
+                        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);