[aarch64-port-dev ] /hg/icedtea7-forest-aarch64/hotspot: restored several load_heap_...

[Andrew Dinn]

Forwarding another check-in message which seems to have been bounced.

n.b. I am not sure why these are still bouncing -- Andrew Haley added a
forwarding pattern for these messages.

------ This is a copy of the message, including all the headers. ------

Return-path: <adinn at icedtea.classpath.org>
Received: from localhost ([127.0.0.1] helo=icedtea.classpath.org)
	by icedtea.classpath.org with esmtp (Exim 4.69)
	(envelope-from <adinn at icedtea.classpath.org>)
	id 1XmMPM-00005Z-BC
	for aarch64-port-dev at openjdk.java.net; Thu, 06 Nov 2014 12:43:24 +0000
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date: Thu, 06 Nov 2014 12:43:24 +0000
Subject: /hg/icedtea7-forest-aarch64/hotspot: restored several load_heap_...
From: adinn at icedtea.classpath.org
X-Hg-Notification: changeset 737d824ee4b5
Message-Id:
<hg.737d824ee4b5.1415277804.-5017525213744097322 at icedtea.classpath.org>
To: aarch64-port-dev at openjdk.java.net

changeset 737d824ee4b5 in /hg/icedtea7-forest-aarch64/hotspot
details:
http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/hotspot?cmd=changeset;node=737d824ee4b5
author: adinn
date: Thu Nov 06 07:41:55 2014 -0500

	restored several load_heap_oop calls lost in translation


diffstat:

 src/cpu/aarch64/vm/methodHandles_aarch64.cpp |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r c4dcf66a46e7 -r 737d824ee4b5
src/cpu/aarch64/vm/methodHandles_aarch64.cpp
--- a/src/cpu/aarch64/vm/methodHandles_aarch64.cpp	Mon Nov 03 04:52:32
2014 -0500
+++ b/src/cpu/aarch64/vm/methodHandles_aarch64.cpp	Thu Nov 06 07:41:55
2014 -0500
@@ -49,7 +49,7 @@
   if (VerifyMethodHandles)
     verify_klass(_masm, klass_reg, SystemDictionaryHandles::Class_klass(),
                  "MH argument is a Class");
-  __ ldr(klass_reg, Address(klass_reg,
java_lang_Class::klass_offset_in_bytes()));
+  __ load_heap_oop(klass_reg, Address(klass_reg,
java_lang_Class::klass_offset_in_bytes()));
 }

 #ifdef ASSERT
@@ -140,7 +140,7 @@
   __ load_heap_oop(method_temp, Address(method_temp,
NONZERO(java_lang_invoke_LambdaForm::vmentry_offset_in_bytes())));
   __ verify_oop(method_temp);
   // the following assumes that a methodOop is normally compressed in
the vmtarget field:
-  __ ldr(method_temp, Address(method_temp,
NONZERO(java_lang_invoke_MemberName::vmtarget_offset_in_bytes())));
+  __ load_heap_oop(method_temp, Address(method_temp,
NONZERO(java_lang_invoke_MemberName::vmtarget_offset_in_bytes())));
   __ verify_oop(method_temp);

   if (VerifyMethodHandles && !for_compiler_entry) {
@@ -334,14 +334,14 @@
       if (VerifyMethodHandles) {
         verify_ref_kind(_masm, JVM_REF_invokeSpecial, member_reg, temp3);
       }
-      __ ldr(rmethod, member_vmtarget);
+      __ load_heap_oop(rmethod, member_vmtarget);
       break;

     case vmIntrinsics::_linkToStatic:
       if (VerifyMethodHandles) {
         verify_ref_kind(_masm, JVM_REF_invokeStatic, member_reg, temp3);
       }
-      __ ldr(rmethod, member_vmtarget);
+      __ load_heap_oop(rmethod, member_vmtarget);
       break;

     case vmIntrinsics::_linkToVirtual: