Mercurial > hg > truffle

diff src/cpu/x86/vm/templateInterpreter_x86_64.cpp @ 4771:22cee0ee8927

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Fri, 06 Jan 2012 20:09:20 -0800
parents dca455dea3a7 069ab3f976d3
children f3d2447db2d9 6759698e3140
line wrap: on
line diff
--- a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Fri Jan 06 16:18:29 2012 -0800
+++ b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Fri Jan 06 20:09:20 2012 -0800
@@ -515,8 +515,7 @@
 
   // get synchronization object
   {
-    const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() +
-                              Klass::java_mirror_offset_in_bytes();
+    const int mirror_offset = in_bytes(Klass::java_mirror_offset());
     Label done;
     __ movl(rax, access_flags);
     __ testl(rax, JVM_ACC_STATIC);
@@ -1016,8 +1015,7 @@
   // pass mirror handle if static call
   {
     Label L;
-    const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() +
-                              Klass::java_mirror_offset_in_bytes();
+    const int mirror_offset = in_bytes(Klass::java_mirror_offset());
     __ movl(t, Address(method, methodOopDesc::access_flags_offset()));
     __ testl(t, JVM_ACC_STATIC);
     __ jcc(Assembler::zero, L);