1.1 --- a/src/cpu/x86/vm/cppInterpreter_x86.cpp Tue Dec 20 00:55:02 2011 -0800 1.2 +++ b/src/cpu/x86/vm/cppInterpreter_x86.cpp Wed Dec 07 11:35:03 2011 +0100 1.3 @@ -511,7 +511,7 @@ 1.4 // get synchronization object 1.5 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(locals, 0)); // get receiver (assume this is frequent case) 1.12 @@ -763,7 +763,7 @@ 1.13 #endif // ASSERT 1.14 // get synchronization object 1.15 { Label done; 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(rax, access_flags); 1.19 __ movptr(rdi, STATE(_locals)); // prepare to get receiver (assume common case) 1.20 __ testl(rax, JVM_ACC_STATIC); 1.21 @@ -1180,7 +1180,7 @@ 1.22 1.23 // pass mirror handle if static call 1.24 { Label L; 1.25 - const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes(); 1.26 + const int mirror_offset = in_bytes(Klass::java_mirror_offset()); 1.27 __ movl(t, Address(method, methodOopDesc::access_flags_offset())); 1.28 __ testl(t, JVM_ACC_STATIC); 1.29 __ jcc(Assembler::zero, L);