--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Fri Jan 06 16:18:29 2012 -0800
+++ b/hotspot/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);