1.1 --- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Dec 20 00:55:02 2011 -0800
1.2 +++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Wed Dec 07 11:35:03 2011 +0100
1.3 @@ -552,7 +552,7 @@
1.4 #endif // ASSERT
1.5 // get synchronization object
1.6 { Label done;
1.7 - const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes();
1.8 + const int mirror_offset = in_bytes(Klass::java_mirror_offset());
1.9 __ movl(rax, access_flags);
1.10 __ testl(rax, JVM_ACC_STATIC);
1.11 __ movptr(rax, Address(rdi, Interpreter::local_offset_in_bytes(0))); // get receiver (assume this is frequent case)
1.12 @@ -1012,7 +1012,7 @@
1.13
1.14 // pass mirror handle if static call
1.15 { Label L;
1.16 - const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes();
1.17 + const int mirror_offset = in_bytes(Klass::java_mirror_offset());
1.18 __ movl(t, Address(method, methodOopDesc::access_flags_offset()));
1.19 __ testl(t, JVM_ACC_STATIC);
1.20 __ jcc(Assembler::zero, L);
